home *** CD-ROM | disk | FTP | other *** search
| Emacs Compiled Lisp | 1995-08-31 | 28.5 KB |
open in: 
MacOS 8.1
|
Win98
|
DOS
view JSON data
|
view as text
This file was processed as: Emacs Compiled Lisp
(other/emacsCompiledLisp).
This format is not currently supported by dexvert.
| Confidence | Program | Detection | Match Type | Support
|
|---|
| 1%
| dexvert
| Emacs Compiled Lisp (other/emacsCompiledLisp)
| magic
| Unsupported |
| 1%
| dexvert
| Combustion 2 Particle Library (other/combustion2ParticleLibrary)
| ext
| Unsupported |
| 100%
| file
| Emacs/XEmacs v19 byte-compiled Lisp data
| default
| |
| 99%
| file
| data
| default
| |
| 100%
| TrID
| Emacs/XEmacs byte-compiled Lisp (generic)
| default
| |
| 100%
| xdgMime
| text/x-emacs-lisp
| default (weak)
|
|
hex view+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 13 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 63 74 68 6f 6d 70 40 |piled by| cthomp@|
|00000020| 77 69 6c 6c 6f 77 2e 63 | 73 2e 75 69 75 63 2e 65 |willow.c|s.uiuc.e|
|00000030| 64 75 20 6f 6e 20 57 65 | 64 20 41 75 67 20 33 30 |du on We|d Aug 30|
|00000040| 20 31 39 3a 33 37 3a 31 | 35 20 31 39 39 35 0a 3b | 19:37:1|5 1995.;|
|00000050| 3b 3b 20 66 72 6f 6d 20 | 66 69 6c 65 20 2f 65 78 |;; from |file /ex|
|00000060| 70 6f 72 74 2f 77 69 6c | 6c 6f 77 33 2f 78 65 6d |port/wil|low3/xem|
|00000070| 61 63 73 2d 31 39 2e 31 | 33 2d 72 65 6c 65 61 73 |acs-19.1|3-releas|
|00000080| 65 2f 65 64 69 74 6f 72 | 2f 6c 69 73 70 2f 65 64 |e/editor|/lisp/ed|
|00000090| 69 66 66 2f 65 64 69 66 | 66 2e 65 6c 0a 3b 3b 3b |iff/edif|f.el.;;;|
|000000a0| 20 65 6d 61 63 73 20 76 | 65 72 73 69 6f 6e 20 31 | emacs v|ersion 1|
|000000b0| 39 2e 31 33 20 58 45 6d | 61 63 73 20 4c 75 63 69 |9.13 XEm|acs Luci|
|000000c0| 64 2e 0a 3b 3b 3b 20 62 | 79 74 65 63 6f 6d 70 20 |d..;;; b|ytecomp |
|000000d0| 76 65 72 73 69 6f 6e 20 | 32 2e 32 35 3b 20 31 2d |version |2.25; 1-|
|000000e0| 53 65 70 2d 39 34 2e 0a | 3b 3b 3b 20 6f 70 74 69 |Sep-94..|;;; opti|
|000000f0| 6d 69 7a 61 74 69 6f 6e | 20 69 73 20 6f 6e 2e 0a |mization| is on..|
|00000100| 3b 3b 3b 20 74 68 69 73 | 20 66 69 6c 65 20 75 73 |;;; this| file us|
|00000110| 65 73 20 6f 70 63 6f 64 | 65 73 20 77 68 69 63 68 |es opcod|es which|
|00000120| 20 64 6f 20 6e 6f 74 20 | 65 78 69 73 74 20 69 6e | do not |exist in|
|00000130| 20 45 6d 61 63 73 20 31 | 38 2e 0a 0a 28 69 66 20 | Emacs 1|8...(if |
|00000140| 28 61 6e 64 20 28 62 6f | 75 6e 64 70 20 27 65 6d |(and (bo|undp 'em|
|00000150| 61 63 73 2d 76 65 72 73 | 69 6f 6e 29 0a 09 20 28 |acs-vers|ion).. (|
|00000160| 6f 72 20 28 61 6e 64 20 | 28 62 6f 75 6e 64 70 20 |or (and |(boundp |
|00000170| 27 65 70 6f 63 68 3a 3a | 76 65 72 73 69 6f 6e 29 |'epoch::|version)|
|00000180| 20 65 70 6f 63 68 3a 3a | 76 65 72 73 69 6f 6e 29 | epoch::|version)|
|00000190| 0a 09 20 20 20 20 20 28 | 73 74 72 69 6e 67 2d 6c |.. (|string-l|
|000001a0| 65 73 73 70 20 65 6d 61 | 63 73 2d 76 65 72 73 69 |essp ema|cs-versi|
|000001b0| 6f 6e 20 22 31 39 22 29 | 29 29 0a 20 20 20 20 28 |on "19")|)). (|
|000001c0| 65 72 72 6f 72 20 22 54 | 68 69 73 20 66 69 6c 65 |error "T|his file|
|000001d0| 20 77 61 73 20 63 6f 6d | 70 69 6c 65 64 20 66 6f | was com|piled fo|
|000001e0| 72 20 45 6d 61 63 73 20 | 31 39 2e 22 29 29 0a 0a |r Emacs |19."))..|
|000001f0| 28 64 65 66 63 6f 6e 73 | 74 20 65 64 69 66 66 2d |(defcons|t ediff-|
|00000200| 76 65 72 73 69 6f 6e 20 | 22 32 2e 34 31 22 20 22 |version |"2.41" "|
|00000210| 5c 0a 54 68 65 20 63 75 | 72 72 65 6e 74 20 76 65 |\.The cu|rrent ve|
|00000220| 72 73 69 6f 6e 20 6f 66 | 20 45 64 69 66 66 22 29 |rsion of| Ediff")|
|00000230| 0a 28 64 65 66 63 6f 6e | 73 74 20 65 64 69 66 66 |.(defcon|st ediff|
|00000240| 2d 64 61 74 65 20 22 41 | 75 67 75 73 74 20 36 2c |-date "A|ugust 6,|
|00000250| 20 31 39 39 35 22 20 22 | 5c 0a 44 61 74 65 20 6f | 1995" "|\.Date o|
|00000260| 66 20 6c 61 73 74 20 75 | 70 64 61 74 65 22 29 0a |f last u|pdate").|
|00000270| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|00000280| c0 c2 21 87 22 20 5b 72 | 65 71 75 69 72 65 20 65 |..!." [r|equire e|
|00000290| 64 69 66 66 2d 69 6e 69 | 74 20 65 64 69 66 66 2d |diff-ini|t ediff-|
|000002a0| 6d 65 74 61 5d 20 32 29 | 0a 28 64 65 66 76 61 72 |meta] 2)|.(defvar|
|000002b0| 20 65 64 69 66 66 2d 76 | 65 72 73 69 6f 6e 2d 63 | ediff-v|ersion-c|
|000002c0| 6f 6e 74 72 6f 6c 2d 70 | 61 63 6b 61 67 65 20 27 |ontrol-p|ackage '|
|000002d0| 76 63 20 22 5c 0a 56 65 | 72 73 69 6f 6e 20 63 6f |vc "\.Ve|rsion co|
|000002e0| 6e 74 72 6f 6c 20 70 61 | 63 6b 61 67 65 20 75 73 |ntrol pa|ckage us|
|000002f0| 65 64 2e 0a 43 75 72 72 | 65 6e 74 6c 79 2c 20 45 |ed..Curr|ently, E|
|00000300| 64 69 66 66 20 73 75 70 | 70 6f 72 74 73 20 76 63 |diff sup|ports vc|
|00000310| 2e 65 6c 20 61 6e 64 20 | 72 63 73 2e 65 6c 2e 20 |.el and |rcs.el. |
|00000320| 53 65 74 20 74 68 69 73 | 20 74 6f 20 60 72 63 73 |Set this| to `rcs|
|00000330| 27 20 69 66 20 79 6f 75 | 20 68 61 76 65 0a 72 63 |' if you| have.rc|
|00000340| 73 2e 65 6c 20 61 6e 64 | 20 77 61 6e 74 20 74 6f |s.el and| want to|
|00000350| 20 75 73 65 20 69 74 20 | 69 6e 73 74 65 61 64 20 | use it |instead |
|00000360| 6f 66 20 74 68 65 20 73 | 74 61 6e 64 61 72 64 20 |of the s|tandard |
|00000370| 76 63 2e 65 6c 2e 0a 0a | 4e 6f 74 65 3a 20 62 6f |vc.el...|Note: bo|
|00000380| 74 68 20 70 61 63 6b 61 | 67 65 73 20 70 72 6f 76 |th packa|ges prov|
|00000390| 69 64 65 20 61 63 63 65 | 73 73 20 74 6f 20 52 43 |ide acce|ss to RC|
|000003a0| 53 2c 20 62 75 74 20 6f | 6e 6c 79 20 76 63 2e 65 |S, but o|nly vc.e|
|000003b0| 6c 20 63 6f 6d 65 73 20 | 77 69 74 68 20 45 6d 61 |l comes |with Ema|
|000003c0| 63 73 0a 64 69 73 74 72 | 69 62 75 74 69 6f 6e 2e |cs.distr|ibution.|
|000003d0| 22 29 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |").(defv|ar ediff|
|000003e0| 2d 72 65 76 69 73 69 6f | 6e 2d 6b 65 79 20 6e 69 |-revisio|n-key ni|
|000003f0| 6c 20 22 5c 0a 4b 65 79 | 20 74 6f 20 77 68 69 63 |l "\.Key| to whic|
|00000400| 68 20 60 65 64 69 66 66 | 2d 72 65 76 69 73 69 6f |h `ediff|-revisio|
|00000410| 6e 27 20 69 73 20 74 6f | 20 62 65 20 62 6f 75 6e |n' is to| be boun|
|00000420| 64 2e 22 29 0a 28 64 65 | 66 76 61 72 20 65 64 69 |d.").(de|fvar edi|
|00000430| 66 66 2d 75 73 65 2d 6c | 61 73 74 2d 64 69 72 20 |ff-use-l|ast-dir |
|00000440| 6e 69 6c 20 22 5c 0a 2a | 49 66 20 74 2c 20 45 64 |nil "\.*|If t, Ed|
|00000450| 69 66 66 20 75 73 65 73 | 20 70 72 65 76 69 6f 75 |iff uses| previou|
|00000460| 73 20 64 69 72 65 63 74 | 6f 72 79 20 61 73 20 64 |s direct|ory as d|
|00000470| 65 66 61 75 6c 74 20 77 | 68 65 6e 20 72 65 61 64 |efault w|hen read|
|00000480| 69 6e 67 20 66 69 6c 65 | 20 6e 61 6d 65 2e 22 29 |ing file| name.")|
|00000490| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 6c |.(defvar| ediff-l|
|000004a0| 61 73 74 2d 64 69 72 2d | 41 20 6e 69 6c 20 22 5c |ast-dir-|A nil "\|
|000004b0| 0a 4c 61 73 74 20 64 69 | 72 65 63 74 6f 72 79 20 |.Last di|rectory |
|000004c0| 75 73 65 64 20 62 79 20 | 61 6e 20 45 64 69 66 66 |used by |an Ediff|
|000004d0| 20 63 6f 6d 6d 61 6e 64 | 20 66 6f 72 20 66 69 6c | command| for fil|
|000004e0| 65 2d 41 2e 22 29 0a 28 | 64 65 66 76 61 72 20 65 |e-A.").(|defvar e|
|000004f0| 64 69 66 66 2d 6c 61 73 | 74 2d 64 69 72 2d 42 20 |diff-las|t-dir-B |
|00000500| 6e 69 6c 20 22 5c 0a 4c | 61 73 74 20 64 69 72 65 |nil "\.L|ast dire|
|00000510| 63 74 6f 72 79 20 75 73 | 65 64 20 62 79 20 61 6e |ctory us|ed by an|
|00000520| 20 45 64 69 66 66 20 63 | 6f 6d 6d 61 6e 64 20 66 | Ediff c|ommand f|
|00000530| 6f 72 20 66 69 6c 65 2d | 42 2e 22 29 0a 28 64 65 |or file-|B.").(de|
|00000540| 66 76 61 72 20 65 64 69 | 66 66 2d 6c 61 73 74 2d |fvar edi|ff-last-|
|00000550| 64 69 72 2d 43 20 6e 69 | 6c 20 22 5c 0a 4c 61 73 |dir-C ni|l "\.Las|
|00000560| 74 20 64 69 72 65 63 74 | 6f 72 79 20 75 73 65 64 |t direct|ory used|
|00000570| 20 62 79 20 61 6e 20 45 | 64 69 66 66 20 63 6f 6d | by an E|diff com|
|00000580| 6d 61 6e 64 20 66 6f 72 | 20 66 69 6c 65 2d 43 2e |mand for| file-C.|
|00000590| 22 29 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |").(defv|ar ediff|
|000005a0| 2d 6c 61 73 74 2d 64 69 | 72 2d 61 6e 63 65 73 74 |-last-di|r-ancest|
|000005b0| 6f 72 20 6e 69 6c 20 22 | 5c 0a 4c 61 73 74 20 64 |or nil "|\.Last d|
|000005c0| 69 72 65 63 74 6f 72 79 | 20 75 73 65 64 20 62 79 |irectory| used by|
|000005d0| 20 61 6e 20 45 64 69 66 | 66 20 63 6f 6d 6d 61 6e | an Edif|f comman|
|000005e0| 64 20 66 6f 72 20 74 68 | 65 20 61 6e 63 65 73 74 |d for th|e ancest|
|000005f0| 6f 72 20 66 69 6c 65 2e | 22 29 0a 28 64 65 66 76 |or file.|").(defv|
|00000600| 61 72 20 65 64 69 66 66 | 2d 6c 61 73 74 2d 64 69 |ar ediff|-last-di|
|00000610| 72 2d 70 61 74 63 68 20 | 6e 69 6c 20 22 5c 0a 4c |r-patch |nil "\.L|
|00000620| 61 73 74 20 64 69 72 65 | 63 74 6f 72 79 20 75 73 |ast dire|ctory us|
|00000630| 65 64 20 62 79 20 61 6e | 20 45 64 69 66 66 20 63 |ed by an| Ediff c|
|00000640| 6f 6d 6d 61 6e 64 20 66 | 6f 72 20 66 69 6c 65 20 |ommand f|or file |
|00000650| 74 6f 20 70 61 74 63 68 | 2e 22 29 0a 28 64 65 66 |to patch|.").(def|
|00000660| 76 61 72 20 65 64 69 66 | 66 2d 73 79 6e 63 68 72 |var edif|f-synchr|
|00000670| 6f 6e 69 7a 65 2d 6d 69 | 6e 69 62 75 66 66 65 72 |onize-mi|nibuffer|
|00000680| 73 20 6e 69 6c 20 22 5c | 0a 49 66 20 6e 6f 6e 2d |s nil "\|.If non-|
|00000690| 6e 69 6c 2c 20 45 64 69 | 66 66 20 73 65 74 73 20 |nil, Edi|ff sets |
|000006a0| 60 73 79 6e 63 68 72 6f | 6e 69 7a 65 2d 6d 69 6e |`synchro|nize-min|
|000006b0| 69 62 75 66 66 65 72 73 | 27 20 75 6e 64 65 72 20 |ibuffers|' under |
|000006c0| 58 45 6d 61 63 73 2e 0a | 54 68 69 73 20 69 73 20 |XEmacs..|This is |
|000006d0| 61 20 74 65 6d 70 6f 72 | 61 72 79 20 68 61 63 6b |a tempor|ary hack|
|000006e0| 20 75 6e 74 69 6c 20 74 | 68 65 20 67 6c 6f 62 61 | until t|he globa|
|000006f0| 6c 20 6d 69 6e 69 62 75 | 66 66 65 72 20 69 73 20 |l minibu|ffer is |
|00000700| 69 6d 70 6c 65 6d 65 6e | 74 65 64 2e 22 29 0a 28 |implemen|ted.").(|
|00000710| 66 73 65 74 20 27 65 64 | 69 66 66 2d 70 61 74 63 |fset 'ed|iff-patc|
|00000720| 68 2d 66 69 6c 65 20 23 | 5b 28 73 6f 75 72 63 65 |h-file #|[(source|
|00000730| 2d 66 69 6c 65 6e 61 6d | 65 20 26 6f 70 74 69 6f |-filenam|e &optio|
|00000740| 6e 61 6c 20 73 74 61 72 | 74 75 70 2d 68 6f 6f 6b |nal star|tup-hook|
|00000750| 73 20 6a 6f 62 2d 6e 61 | 6d 65 29 20 22 c0 09 21 |s job-na|me) "..!|
|00000760| 11 c2 0b c4 3d ab af 70 | 1d c6 09 21 ab 9c c7 c6 |....=..p|...!....|
|00000770| 09 21 21 ab 95 c8 c7 c6 | 09 21 21 21 ab 8c c9 8e |.!!.....|.!!!....|
|00000780| c6 09 21 71 88 0e 5c 6e | 29 aa 89 0e 0b cc 3d ae |..!q..\n|).....=.|
|00000790| 83 cd ce 21 29 aa 83 cf | 09 21 21 88 0e 10 d1 d2 |...!)...|.!!.....|
|000007a0| 0e 10 5c 22 ab 84 d3 95 | aa 81 d3 d1 d4 0e 10 5c |..\"....|.......\|
|000007b0| 22 ab 84 d3 95 aa 81 d3 | 4f 1e 15 0e 16 1e 17 09 |".......|O.......|
|000007c0| 1e 18 09 1e 19 da 1e 1b | da 1e 1c da 1e 1d da 1e |........|........|
|000007d0| 1e 0e 15 df 98 ab 83 e0 | 16 15 e1 d8 dc e2 e3 24 |........|.......$|
|000007e0| 88 e4 0e 18 21 e4 09 21 | 9a 3f 16 1d e5 0e 1c 21 |....!..!|.?.....!|
|000007f0| 89 1e 26 3b ad 93 e7 0e | 26 21 ad 8d e8 0e 26 21 |..&;....|&!....&!|
|00000800| 3f ad 86 e7 0e 26 e9 50 | 21 29 ab 85 ea 0e 1c 21 |?....&.P|!).....!|
|00000810| 88 70 1d 0e 2b ab ae c7 | 0e 2b 21 ab a8 c8 c7 0e |.p..+...|.+!.....|
|00000820| 2b 21 21 ab a0 ec 8e 0e | 2b 71 88 ed ee 21 88 ef |+!!.....|+q...!..|
|00000830| 65 64 f0 f1 0e 32 0e 10 | 0e 15 c0 0e 18 21 25 f3 |ed...2..|.....!%.|
|00000840| 24 88 29 aa 8a 0e 0b cc | 3d ac 84 cd ce 21 88 29 |$.).....|=....!.)|
|00000850| f4 0e 2b 21 88 f5 d3 21 | 88 e7 0e 18 0e 15 50 21 |..+!...!|......P!|
|00000860| ac 84 cd f6 21 88 0e 1d | ac b5 70 1d 0e 1c ab a2 |....!...|..p.....|
|00000870| c7 0e 1c 21 ab 9c c8 c7 | 0e 1c 21 21 ab 94 f7 8e |...!....|..!!....|
|00000880| 0e 1c 71 88 f8 09 0e 15 | 50 21 88 f9 da 21 88 29 |..q.....|P!...!.)|
|00000890| aa 8a 0e 0b cc 3d ac 84 | cd ce 21 88 29 aa af e4 |.....=..|..!.)...|
|000008a0| 09 21 1e 3a fb 0e 3c 21 | ad 85 0e 3c 0e 3a 21 29 |.!.:..<!|...<.:!)|
|000008b0| ab 84 0e 18 aa 81 09 fd | 50 16 19 fe 0e 18 0e 19 |........|P.......|
|000008c0| f3 23 88 fe 0e 18 0e 15 | 50 0e 18 f3 23 88 ff 0e |.#......|P...#...|
|000008d0| 23 42 16 23 81 40 00 0e | 19 21 16 1b 81 41 00 0e |#B.#.@..|.!...A..|
|000008e0| 1c 0e 1b da 0e 23 0b ae | 83 81 42 00 25 16 1e 81 |.....#..|..B.%...|
|000008f0| 43 00 0e 2b 21 88 ed 81 | 44 00 c8 0e 2b 21 5c 22 |C..+!...|D...+!\"|
|00000900| 88 0e 1e 2e 08 87 22 20 | 5b 65 78 70 61 6e 64 2d |......" |[expand-|
|00000910| 66 69 6c 65 2d 6e 61 6d | 65 20 73 6f 75 72 63 65 |file-nam|e source|
|00000920| 2d 66 69 6c 65 6e 61 6d | 65 20 65 64 69 66 66 2d |-filenam|e ediff-|
|00000930| 67 65 74 2d 70 61 74 63 | 68 2d 62 75 66 66 65 72 |get-patc|h-buffer|
|00000940| 20 6a 6f 62 2d 6e 61 6d | 65 20 65 64 69 66 66 2d | job-nam|e ediff-|
|00000950| 70 61 74 63 68 2d 62 75 | 66 66 65 72 20 53 74 61 |patch-bu|ffer Sta|
|00000960| 72 74 42 75 66 66 65 72 | 20 67 65 74 2d 66 69 6c |rtBuffer| get-fil|
|00000970| 65 2d 62 75 66 66 65 72 | 20 67 65 74 2d 62 75 66 |e-buffer| get-buf|
|00000980| 66 65 72 20 62 75 66 66 | 65 72 2d 6e 61 6d 65 20 |fer buff|er-name |
|00000990| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|000009a0| 72 74 42 75 66 66 65 72 | 29 29 20 64 65 66 61 75 |rtBuffer|)) defau|
|000009b0| 6c 74 2d 64 69 72 65 63 | 74 6f 72 79 20 74 68 69 |lt-direc|tory thi|
|000009c0| 73 2d 63 6f 6d 6d 61 6e | 64 20 65 64 69 66 66 2d |s-comman|d ediff-|
|000009d0| 71 75 69 74 20 65 72 72 | 6f 72 20 22 59 6f 75 27 |quit err|or "You'|
|000009e0| 76 65 20 6b 69 6c 6c 65 | 64 20 61 6e 20 65 73 73 |ve kille|d an ess|
|000009f0| 65 6e 74 69 61 6c 20 45 | 64 69 66 66 20 62 75 66 |ential E|diff buf|
|00000a00| 66 65 72 2d 2d 2d 50 6c | 65 61 73 65 20 71 75 69 |fer---Pl|ease qui|
|00000a10| 74 20 45 64 69 66 66 22 | 20 66 69 6c 65 2d 6e 61 |t Ediff"| file-na|
|00000a20| 6d 65 2d 64 69 72 65 63 | 74 6f 72 79 20 65 64 69 |me-direc|tory edi|
|00000a30| 66 66 2d 70 61 74 63 68 | 2d 6f 70 74 69 6f 6e 73 |ff-patch|-options|
|00000a40| 20 73 74 72 69 6e 67 2d | 6d 61 74 63 68 20 22 2d | string-|match "-|
|00000a50| 62 5b 20 09 5d 2b 22 20 | 30 20 22 2d 62 5b 20 09 |b[ .]+" |0 "-b[ .|
|00000a60| 5d 2b 5b 5e 20 09 5d 2b | 22 20 62 61 63 6b 75 70 |]+[^ .]+|" backup|
|00000a70| 2d 65 78 74 65 6e 73 69 | 6f 6e 20 65 64 69 66 66 |-extensi|on ediff|
|00000a80| 2d 73 68 65 6c 6c 20 73 | 68 65 6c 6c 2d 66 69 6c |-shell s|hell-fil|
|00000a90| 65 2d 6e 61 6d 65 20 74 | 72 75 65 2d 73 6f 75 72 |e-name t|rue-sour|
|00000aa0| 63 65 2d 66 69 6c 65 6e | 61 6d 65 20 74 61 72 67 |ce-filen|ame targ|
|00000ab0| 65 74 2d 66 69 6c 65 6e | 61 6d 65 20 6e 69 6c 20 |et-filen|ame nil |
|00000ac0| 74 61 72 67 65 74 2d 62 | 75 66 20 62 75 66 2d 74 |target-b|uf buf-t|
|00000ad0| 6f 2d 70 61 74 63 68 20 | 66 69 6c 65 2d 6e 61 6d |o-patch |file-nam|
|00000ae0| 65 2d 6d 61 67 69 63 2d | 70 20 63 74 6c 2d 62 75 |e-magic-|p ctl-bu|
|00000af0| 66 20 22 22 20 22 5f 6f | 72 69 67 22 20 65 64 69 |f "" "_o|rig" edi|
|00000b00| 66 66 2d 66 69 6e 64 2d | 66 69 6c 65 20 65 64 69 |ff-find-|file edi|
|00000b10| 66 66 2d 6c 61 73 74 2d | 64 69 72 2d 70 61 74 63 |ff-last-|dir-patc|
|00000b20| 68 20 73 74 61 72 74 75 | 70 2d 68 6f 6f 6b 73 20 |h startu|p-hooks |
|00000b30| 66 69 6c 65 2d 74 72 75 | 65 6e 61 6d 65 20 62 75 |file-tru|ename bu|
|00000b40| 66 66 65 72 2d 66 69 6c | 65 2d 6e 61 6d 65 20 66 |ffer-fil|e-name f|
|00000b50| 69 6c 65 20 66 69 6c 65 | 2d 65 78 69 73 74 73 2d |ile file|-exists-|
|00000b60| 70 20 66 69 6c 65 2d 77 | 72 69 74 61 62 6c 65 2d |p file-w|ritable-|
|00000b70| 70 20 22 2c 76 22 20 65 | 64 69 66 66 2d 74 6f 67 |p ",v" e|diff-tog|
|00000b80| 67 6c 65 2d 72 65 61 64 | 2d 6f 6e 6c 79 20 65 64 |gle-read|-only ed|
|00000b90| 69 66 66 2d 70 61 74 63 | 68 2d 64 69 61 67 6e 6f |iff-patc|h-diagno|
|00000ba0| 73 74 69 63 73 20 28 28 | 73 65 74 2d 62 75 66 66 |stics ((|set-buff|
|00000bb0| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|00000bc0| 20 6d 65 73 73 61 67 65 | 20 22 41 70 70 6c 79 69 | message| "Applyi|
|00000bd0| 6e 67 20 70 61 74 63 68 | 20 2e 2e 2e 20 22 20 73 |ng patch| ... " s|
|00000be0| 68 65 6c 6c 2d 63 6f 6d | 6d 61 6e 64 2d 6f 6e 2d |hell-com|mand-on-|
|00000bf0| 72 65 67 69 6f 6e 20 66 | 6f 72 6d 61 74 20 22 25 |region f|ormat "%|
|00000c00| 73 20 2d 66 20 25 73 20 | 2d 62 20 25 73 20 25 73 |s -f %s |-b %s %s|
|00000c10| 22 20 65 64 69 66 66 2d | 70 61 74 63 68 2d 70 72 |" ediff-|patch-pr|
|00000c20| 6f 67 72 61 6d 20 74 20 | 73 77 69 74 63 68 2d 74 |ogram t |switch-t|
|00000c30| 6f 2d 62 75 66 66 65 72 | 20 73 69 74 2d 66 6f 72 |o-buffer| sit-for|
|00000c40| 20 22 50 61 74 63 68 20 | 66 61 69 6c 65 64 20 6f | "Patch |failed o|
|00000c50| 72 20 64 69 64 6e 27 74 | 20 6d 6f 64 69 66 79 20 |r didn't| modify |
|00000c60| 74 68 65 20 6f 72 69 67 | 69 6e 61 6c 20 66 69 6c |the orig|inal fil|
|00000c70| 65 22 20 28 28 73 65 74 | 2d 62 75 66 66 65 72 20 |e" ((set|-buffer |
|00000c80| 53 74 61 72 74 42 75 66 | 66 65 72 29 29 20 73 65 |StartBuf|fer)) se|
|00000c90| 74 2d 76 69 73 69 74 65 | 64 2d 66 69 6c 65 2d 6e |t-visite|d-file-n|
|00000ca0| 61 6d 65 20 73 65 74 2d | 62 75 66 66 65 72 2d 6d |ame set-|buffer-m|
|00000cb0| 6f 64 69 66 69 65 64 2d | 70 20 66 69 6c 65 2d 6e |odified-|p file-n|
|00000cc0| 61 6d 65 20 66 62 6f 75 | 6e 64 70 20 65 64 69 66 |ame fbou|ndp edif|
|00000cd0| 66 2d 61 6e 67 65 2d 66 | 74 70 2d 66 74 70 2d 6e |f-ange-f|tp-ftp-n|
|00000ce0| 61 6d 65 20 22 5f 70 61 | 74 63 68 65 64 22 20 72 |ame "_pa|tched" r|
|00000cf0| 65 6e 61 6d 65 2d 66 69 | 6c 65 20 65 64 69 66 66 |ename-fi|le ediff|
|00000d00| 2d 73 65 74 2d 72 65 61 | 64 2d 6f 6e 6c 79 2d 69 |-set-rea|d-only-i|
|00000d10| 6e 2d 62 75 66 2d 41 20 | 66 69 6e 64 2d 66 69 6c |n-buf-A |find-fil|
|00000d20| 65 2d 6e 6f 73 65 6c 65 | 63 74 20 65 64 69 66 66 |e-nosele|ct ediff|
|00000d30| 2d 62 75 66 66 65 72 73 | 2d 69 6e 74 65 72 6e 61 |-buffers|-interna|
|00000d40| 6c 20 65 64 69 66 66 2d | 70 61 74 63 68 2d 66 69 |l ediff-|patch-fi|
|00000d50| 6c 65 20 62 75 72 79 2d | 62 75 66 66 65 72 20 22 |le bury-|buffer "|
|00000d60| 50 61 74 63 68 20 64 69 | 61 67 6e 6f 73 74 69 63 |Patch di|agnostic|
|00000d70| 73 20 61 72 65 20 61 76 | 61 69 6c 61 62 6c 65 20 |s are av|ailable |
|00000d80| 69 6e 20 62 75 66 66 65 | 72 20 25 73 22 5d 20 31 |in buffe|r %s"] 1|
|00000d90| 31 20 22 5c 0a 52 75 6e | 20 45 64 69 66 66 20 62 |1 "\.Run| Ediff b|
|00000da0| 79 20 70 61 74 63 68 69 | 6e 67 20 46 49 4c 45 2d |y patchi|ng FILE-|
|00000db0| 54 50 2d 50 41 54 43 48 | 2e 22 20 28 62 79 74 65 |TP-PATCH|." (byte|
|00000dc0| 2d 63 6f 64 65 20 22 c0 | c1 5c 6e ab 83 0b aa 81 |-code ".|.\n.....|
|00000dd0| 0c c5 70 21 ad 85 c6 c5 | 70 21 21 23 43 87 22 20 |..p!....|p!!#C." |
|00000de0| 5b 65 64 69 66 66 2d 72 | 65 61 64 2d 66 69 6c 65 |[ediff-r|ead-file|
|00000df0| 2d 6e 61 6d 65 20 22 46 | 69 6c 65 20 74 6f 20 70 |-name "F|ile to p|
|00000e00| 61 74 63 68 22 20 65 64 | 69 66 66 2d 75 73 65 2d |atch" ed|iff-use-|
|00000e10| 6c 61 73 74 2d 64 69 72 | 20 65 64 69 66 66 2d 6c |last-dir| ediff-l|
|00000e20| 61 73 74 2d 64 69 72 2d | 70 61 74 63 68 20 64 65 |ast-dir-|patch de|
|00000e30| 66 61 75 6c 74 2d 64 69 | 72 65 63 74 6f 72 79 20 |fault-di|rectory |
|00000e40| 62 75 66 66 65 72 2d 66 | 69 6c 65 2d 6e 61 6d 65 |buffer-f|ile-name|
|00000e50| 20 66 69 6c 65 2d 6e 61 | 6d 65 2d 6e 6f 6e 64 69 | file-na|me-nondi|
|00000e60| 72 65 63 74 6f 72 79 5d | 20 36 29 5d 29 0a 28 66 |rectory]| 6)]).(f|
|00000e70| 73 65 74 20 27 65 64 69 | 66 66 2d 73 65 74 2d 72 |set 'edi|ff-set-r|
|00000e80| 65 61 64 2d 6f 6e 6c 79 | 2d 69 6e 2d 62 75 66 2d |ead-only|-in-buf-|
|00000e90| 41 20 23 5b 6e 69 6c 20 | 22 70 18 09 ab 97 c2 09 |A #[nil |"p......|
|00000ea0| 21 ab 92 c3 c2 09 21 21 | ab 8b c4 8e 09 71 88 c5 |!.....!!|.....q..|
|00000eb0| c6 21 29 aa 89 0e 07 c8 | 3d ae 83 c9 ca 21 29 87 |.!).....|=....!).|
|00000ec0| 22 20 5b 53 74 61 72 74 | 42 75 66 66 65 72 20 65 |" [Start|Buffer e|
|00000ed0| 64 69 66 66 2d 62 75 66 | 66 65 72 2d 41 20 67 65 |diff-buf|fer-A ge|
|00000ee0| 74 2d 62 75 66 66 65 72 | 20 62 75 66 66 65 72 2d |t-buffer| buffer-|
|00000ef0| 6e 61 6d 65 20 28 28 73 | 65 74 2d 62 75 66 66 65 |name ((s|et-buffe|
|00000f00| 72 20 53 74 61 72 74 42 | 75 66 66 65 72 29 29 20 |r StartB|uffer)) |
|00000f10| 74 6f 67 67 6c 65 2d 72 | 65 61 64 2d 6f 6e 6c 79 |toggle-r|ead-only|
|00000f20| 20 31 20 74 68 69 73 2d | 63 6f 6d 6d 61 6e 64 20 | 1 this-|command |
|00000f30| 65 64 69 66 66 2d 71 75 | 69 74 20 65 72 72 6f 72 |ediff-qu|it error|
|00000f40| 20 22 59 6f 75 27 76 65 | 20 6b 69 6c 6c 65 64 20 | "You've| killed |
|00000f50| 61 6e 20 65 73 73 65 6e | 74 69 61 6c 20 45 64 69 |an essen|tial Edi|
|00000f60| 66 66 20 62 75 66 66 65 | 72 2d 2d 2d 50 6c 65 61 |ff buffe|r---Plea|
|00000f70| 73 65 20 71 75 69 74 20 | 45 64 69 66 66 22 5d 20 |se quit |Ediff"] |
|00000f80| 33 20 22 5c 0a 55 73 65 | 64 20 61 73 20 61 20 73 |3 "\.Use|d as a s|
|00000f90| 74 61 72 74 75 70 20 68 | 6f 6f 6b 20 74 6f 20 73 |tartup h|ook to s|
|00000fa0| 65 74 20 60 5f 6f 72 69 | 67 27 20 70 61 74 63 68 |et `_ori|g' patch|
|00000fb0| 20 66 69 6c 65 20 72 65 | 61 64 2d 6f 6e 6c 79 2e | file re|ad-only.|
|00000fc0| 22 5d 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |"]).(byt|e-code "|
|00000fd0| c0 c1 c2 5c 22 88 c0 c3 | c4 5c 22 87 22 20 5b 64 |...\"...|.\"." [d|
|00000fe0| 65 66 61 6c 69 61 73 20 | 65 70 61 74 63 68 20 65 |efalias |epatch e|
|00000ff0| 64 69 66 66 2d 70 61 74 | 63 68 2d 66 69 6c 65 20 |diff-pat|ch-file |
|00001000| 65 70 61 74 63 68 2d 62 | 75 66 66 65 72 20 65 64 |epatch-b|uffer ed|
|00001010| 69 66 66 2d 70 61 74 63 | 68 2d 62 75 66 66 65 72 |iff-patc|h-buffer|
|00001020| 5d 20 33 29 0a 28 66 73 | 65 74 20 27 65 64 69 66 |] 3).(fs|et 'edif|
|00001030| 66 2d 66 69 6c 65 73 20 | 23 5b 28 66 69 6c 65 2d |f-files |#[(file-|
|00001040| 41 20 66 69 6c 65 2d 42 | 20 26 6f 70 74 69 6f 6e |A file-B| &option|
|00001050| 61 6c 20 73 74 61 72 74 | 75 70 2d 68 6f 6f 6b 73 |al start|up-hooks|
|00001060| 29 20 22 c0 09 c2 0b 21 | ab 88 c4 c5 09 21 0b 5c |) "....!|.....!.\|
|00001070| 22 aa 81 0b c6 0e 07 c8 | 25 87 22 20 5b 65 64 69 |".......|%." [edi|
|00001080| 66 66 2d 66 69 6c 65 73 | 2d 69 6e 74 65 72 6e 61 |ff-files|-interna|
|00001090| 6c 20 66 69 6c 65 2d 41 | 20 66 69 6c 65 2d 64 69 |l file-A| file-di|
|000010a0| 72 65 63 74 6f 72 79 2d | 70 20 66 69 6c 65 2d 42 |rectory-|p file-B|
|000010b0| 20 65 78 70 61 6e 64 2d | 66 69 6c 65 2d 6e 61 6d | expand-|file-nam|
|000010c0| 65 20 66 69 6c 65 2d 6e | 61 6d 65 2d 6e 6f 6e 64 |e file-n|ame-nond|
|000010d0| 69 72 65 63 74 6f 72 79 | 20 6e 69 6c 20 73 74 61 |irectory| nil sta|
|000010e0| 72 74 75 70 2d 68 6f 6f | 6b 73 20 65 64 69 66 66 |rtup-hoo|ks ediff|
|000010f0| 2d 66 69 6c 65 73 5d 20 | 36 20 22 5c 0a 52 75 6e |-files] |6 "\.Run|
|00001100| 20 45 64 69 66 66 20 6f | 6e 20 61 20 70 61 69 72 | Ediff o|n a pair|
|00001110| 20 6f 66 20 66 69 6c 65 | 73 2c 20 46 49 4c 45 2d | of file|s, FILE-|
|00001120| 41 20 61 6e 64 20 46 49 | 4c 45 2d 42 2e 22 20 28 |A and FI|LE-B." (|
|00001130| 62 79 74 65 2d 63 6f 64 | 65 20 22 08 ab 83 09 aa |byte-cod|e ".....|
|00001140| 81 5c 6e c3 89 1c 1d 1e | 06 c7 c8 0e 06 c9 70 21 |.\n.....|......p!|
|00001150| ad 85 ca c9 70 21 21 23 | 89 14 c7 cb 08 ab 84 0e |....p!!#|........|
|00001160| 0c aa 83 cd 0c 21 89 15 | ce ca 0c 21 0d 5c 22 c3 |.....!..|...!.\".|
|00001170| 1e 0f 1e 10 0e 0f 3b ab | 8e 0e 0f d1 42 43 1e 12 |......;.|....BC..|
|00001180| d3 0e 10 21 29 aa 8f 0e | 14 ab 86 d3 0e 10 21 aa |...!)...|......!.|
|00001190| 85 d3 0e 10 d5 5c 22 2a | 0e 16 42 16 16 0c 23 2b |.....\"*|..B...#+|
|000011a0| 44 87 22 20 5b 65 64 69 | 66 66 2d 75 73 65 2d 6c |D." [edi|ff-use-l|
|000011b0| 61 73 74 2d 64 69 72 20 | 65 64 69 66 66 2d 6c 61 |ast-dir |ediff-la|
|000011c0| 73 74 2d 64 69 72 2d 41 | 20 64 65 66 61 75 6c 74 |st-dir-A| default|
|000011d0| 2d 64 69 72 65 63 74 6f | 72 79 20 6e 69 6c 20 66 |-directo|ry nil f|
|000011e0| 20 64 69 72 2d 42 20 64 | 69 72 2d 41 20 65 64 69 | dir-B d|ir-A edi|
|000011f0| 66 66 2d 72 65 61 64 2d | 66 69 6c 65 2d 6e 61 6d |ff-read-|file-nam|
|00001200| 65 20 22 46 69 6c 65 20 | 41 20 74 6f 20 63 6f 6d |e "File |A to com|
|00001210| 70 61 72 65 22 20 62 75 | 66 66 65 72 2d 66 69 6c |pare" bu|ffer-fil|
|00001220| 65 2d 6e 61 6d 65 20 66 | 69 6c 65 2d 6e 61 6d 65 |e-name f|ile-name|
|00001230| 2d 6e 6f 6e 64 69 72 65 | 63 74 6f 72 79 20 22 46 |-nondire|ctory "F|
|00001240| 69 6c 65 20 42 20 74 6f | 20 63 6f 6d 70 61 72 65 |ile B to| compare|
|00001250| 22 20 65 64 69 66 66 2d | 6c 61 73 74 2d 64 69 72 |" ediff-|last-dir|
|00001260| 2d 42 20 66 69 6c 65 2d | 6e 61 6d 65 2d 64 69 72 |-B file-|name-dir|
|00001270| 65 63 74 6f 72 79 20 65 | 78 70 61 6e 64 2d 66 69 |ectory e|xpand-fi|
|00001280| 6c 65 2d 6e 61 6d 65 20 | 64 69 72 20 66 69 6c 65 |le-name |dir file|
|00001290| 20 22 22 20 64 69 72 65 | 63 74 6f 72 79 2d 61 62 | "" dire|ctory-ab|
|000012a0| 62 72 65 76 2d 61 6c 69 | 73 74 20 61 62 62 72 65 |brev-ali|st abbre|
|000012b0| 76 69 61 74 65 2d 66 69 | 6c 65 2d 6e 61 6d 65 20 |viate-fi|le-name |
|000012c0| 65 64 69 66 66 2d 65 6d | 61 63 73 2d 70 20 74 20 |ediff-em|acs-p t |
|000012d0| 66 69 6c 65 2d 6e 61 6d | 65 2d 68 69 73 74 6f 72 |file-nam|e-histor|
|000012e0| 79 5d 20 37 29 5d 29 0a | 28 66 73 65 74 20 27 65 |y] 7)]).|(fset 'e|
|000012f0| 64 69 66 66 2d 66 69 6c | 65 73 33 20 23 5b 28 66 |diff-fil|es3 #[(f|
|00001300| 69 6c 65 2d 41 20 66 69 | 6c 65 2d 42 20 66 69 6c |ile-A fi|le-B fil|
|00001310| 65 2d 43 20 26 6f 70 74 | 69 6f 6e 61 6c 20 73 74 |e-C &opt|ional st|
|00001320| 61 72 74 75 70 2d 68 6f | 6f 6b 73 29 20 22 c0 09 |artup-ho|oks) "..|
|00001330| c2 0b 21 ab 88 c4 c5 09 | 21 0b 5c 22 aa 81 0b c2 |..!.....|!.\"....|
|00001340| 0e 06 21 ab 89 c4 c5 09 | 21 0e 06 5c 22 aa 82 0e |..!.....|!..\"...|
|00001350| 06 0e 07 c8 25 87 22 20 | 5b 65 64 69 66 66 2d 66 |....%." |[ediff-f|
|00001360| 69 6c 65 73 2d 69 6e 74 | 65 72 6e 61 6c 20 66 69 |iles-int|ernal fi|
|00001370| 6c 65 2d 41 20 66 69 6c | 65 2d 64 69 72 65 63 74 |le-A fil|e-direct|
|00001380| 6f 72 79 2d 70 20 66 69 | 6c 65 2d 42 20 65 78 70 |ory-p fi|le-B exp|
|00001390| 61 6e 64 2d 66 69 6c 65 | 2d 6e 61 6d 65 20 66 69 |and-file|-name fi|
|000013a0| 6c 65 2d 6e 61 6d 65 2d | 6e 6f 6e 64 69 72 65 63 |le-name-|nondirec|
|000013b0| 74 6f 72 79 20 66 69 6c | 65 2d 43 20 73 74 61 72 |tory fil|e-C star|
|000013c0| 74 75 70 2d 68 6f 6f 6b | 73 20 65 64 69 66 66 2d |tup-hook|s ediff-|
|000013d0| 66 69 6c 65 73 33 5d 20 | 36 20 22 5c 0a 52 75 6e |files3] |6 "\.Run|
|000013e0| 20 45 64 69 66 66 20 6f | 6e 20 74 68 72 65 65 20 | Ediff o|n three |
|000013f0| 66 69 6c 65 73 2c 20 46 | 49 4c 45 2d 41 2c 20 46 |files, F|ILE-A, F|
|00001400| 49 4c 45 2d 42 2c 20 61 | 6e 64 20 46 49 4c 45 2d |ILE-B, a|nd FILE-|
|00001410| 43 2e 22 20 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |C." (byt|e-code "|
|00001420| 08 ab 83 09 aa 81 5c 6e | c3 89 89 89 1c 1d 1e 06 |......\n|........|
|00001430| 1e 07 1e 08 c9 ca 0e 08 | cb 70 21 ad 85 cc cb 70 |........|.p!....p|
|00001440| 21 21 23 89 15 c9 cd 08 | ab 84 0e 0e aa 83 cf 0d |!!#.....|........|
|00001450| 21 89 16 07 d0 cc 0d 21 | 0e 07 5c 22 c3 1e 11 1e |!......!|..\"....|
|00001460| 12 0e 11 3b ab 8e 0e 11 | d3 42 43 1e 14 d5 0e 12 |...;....|.BC.....|
|00001470| 21 29 aa 8f 0e 16 ab 86 | d5 0e 12 21 aa 85 d5 0e |!)......|...!....|
|00001480| 12 d7 5c 22 2a 0e 18 42 | 16 18 0d 23 89 14 c9 d9 |..\"*..B|...#....|
|00001490| 08 ab 84 0e 1a aa 83 cf | 0c 21 89 16 06 d0 cc 0c |........|.!......|
|000014a0| 21 0e 06 5c 22 c3 1e 11 | 1e 12 0e 11 3b ab 8e 0e |!..\"...|....;...|
|000014b0| 11 d3 42 43 1e 14 d5 0e | 12 21 29 aa 8f 0e 16 ab |..BC....|.!).....|
|000014c0| 86 d5 0e 12 21 aa 85 d5 | 0e 12 d7 5c 22 2a 0e 18 |....!...|...\"*..|
|000014d0| 42 16 18 0c 23 45 2d 87 | 22 20 5b 65 64 69 66 66 |B...#E-.|" [ediff|
|000014e0| 2d 75 73 65 2d 6c 61 73 | 74 2d 64 69 72 20 65 64 |-use-las|t-dir ed|
|000014f0| 69 66 66 2d 6c 61 73 74 | 2d 64 69 72 2d 41 20 64 |iff-last|-dir-A d|
|00001500| 65 66 61 75 6c 74 2d 64 | 69 72 65 63 74 6f 72 79 |efault-d|irectory|
|00001510| 20 6e 69 6c 20 66 66 20 | 66 20 64 69 72 2d 43 20 | nil ff |f dir-C |
|00001520| 64 69 72 2d 42 20 64 69 | 72 2d 41 20 65 64 69 66 |dir-B di|r-A edif|
|00001530| 66 2d 72 65 61 64 2d 66 | 69 6c 65 2d 6e 61 6d 65 |f-read-f|ile-name|
|00001540| 20 22 46 69 6c 65 20 41 | 20 74 6f 20 63 6f 6d 70 | "File A| to comp|
|00001550| 61 72 65 22 20 62 75 66 | 66 65 72 2d 66 69 6c 65 |are" buf|fer-file|
|00001560| 2d 6e 61 6d 65 20 66 69 | 6c 65 2d 6e 61 6d 65 2d |-name fi|le-name-|
|00001570| 6e 6f 6e 64 69 72 65 63 | 74 6f 72 79 20 22 46 69 |nondirec|tory "Fi|
|00001580| 6c 65 20 42 20 74 6f 20 | 63 6f 6d 70 61 72 65 22 |le B to |compare"|
|00001590| 20 65 64 69 66 66 2d 6c | 61 73 74 2d 64 69 72 2d | ediff-l|ast-dir-|
|000015a0| 42 20 66 69 6c 65 2d 6e | 61 6d 65 2d 64 69 72 65 |B file-n|ame-dire|
|000015b0| 63 74 6f 72 79 20 65 78 | 70 61 6e 64 2d 66 69 6c |ctory ex|pand-fil|
|000015c0| 65 2d 6e 61 6d 65 20 64 | 69 72 20 66 69 6c 65 20 |e-name d|ir file |
|000015d0| 22 22 20 64 69 72 65 63 | 74 6f 72 79 2d 61 62 62 |"" direc|tory-abb|
|000015e0| 72 65 76 2d 61 6c 69 73 | 74 20 61 62 62 72 65 76 |rev-alis|t abbrev|
|000015f0| 69 61 74 65 2d 66 69 6c | 65 2d 6e 61 6d 65 20 65 |iate-fil|e-name e|
|00001600| 64 69 66 66 2d 65 6d 61 | 63 73 2d 70 20 74 20 66 |diff-ema|cs-p t f|
|00001610| 69 6c 65 2d 6e 61 6d 65 | 2d 68 69 73 74 6f 72 79 |ile-name|-history|
|00001620| 20 22 46 69 6c 65 20 43 | 20 74 6f 20 63 6f 6d 70 | "File C| to comp|
|00001630| 61 72 65 22 20 65 64 69 | 66 66 2d 6c 61 73 74 2d |are" edi|ff-last-|
|00001640| 64 69 72 2d 43 5d 20 38 | 29 5d 29 0a 28 64 65 66 |dir-C] 8|)]).(def|
|00001650| 61 6c 69 61 73 20 27 65 | 64 69 66 66 33 20 27 65 |alias 'e|diff3 'e|
|00001660| 64 69 66 66 2d 66 69 6c | 65 73 33 29 0a 28 66 73 |diff-fil|es3).(fs|
|00001670| 65 74 20 27 65 64 69 66 | 66 2d 66 69 6e 64 2d 66 |et 'edif|f-find-f|
|00001680| 69 6c 65 20 23 5b 28 66 | 69 6c 65 2d 76 61 72 20 |ile #[(f|ile-var |
|00001690| 62 75 66 66 65 72 2d 6e | 61 6d 65 20 26 6f 70 74 |buffer-n|ame &opt|
|000016a0| 69 6f 6e 61 6c 20 6c 61 | 73 74 2d 64 69 72 20 68 |ional la|st-dir h|
|000016b0| 6f 6f 6b 73 2d 76 61 72 | 29 20 22 08 4a 19 c2 09 |ooks-var|) ".J...|
|000016c0| c3 5c 22 1c c5 09 21 1e | 06 c7 09 21 ac 87 c8 c9 |.\"...!.|...!....|
|000016d0| 09 5c 22 88 aa 8a ca 09 | 21 ab 85 c8 cb 09 5c 22 |.\".....|!.....\"|
|000016e0| 88 cc 09 21 11 0e 0d ab | 89 0e 0d cc ce 09 21 21 |...!....|......!!|
|000016f0| 4c 88 0e 0f c3 09 21 4c | 88 70 1e 10 0e 0f 4a ab |L.....!L|.p....J.|
|00001700| dc d1 0e 0f 4a 21 ab d5 | cf d1 0e 0f 4a 21 21 ab |....J!..|....J!!.|
|00001710| cc d2 8e 0e 0f 4a 71 88 | 7e 88 0c ab 9a d3 d4 21 |.....Jq.|~......!|
|00001720| 88 d5 70 0e 06 5c 22 11 | 0e 16 d7 d8 d9 09 44 45 |..p..\".|......DE|
|00001730| 0e 16 4a 42 4c 88 aa a3 | da 09 21 da db 20 21 9a |..JBL...|..!.. !.|
|00001740| ac 96 d5 70 0e 06 5c 22 | 11 0e 16 d7 d8 d9 09 44 |...p..\"|.......D|
|00001750| 45 0e 16 4a 42 4c 88 aa | 83 d3 20 88 29 aa 8a 0e |E..JBL..|.. .)...|
|00001760| 1c dd 3d ac 84 c8 de 21 | 88 29 08 09 4c 2b 87 22 |..=....!|.)..L+."|
|00001770| 20 5b 66 69 6c 65 2d 76 | 61 72 20 66 69 6c 65 20 | [file-v|ar file |
|00001780| 66 69 6e 64 2d 66 69 6c | 65 2d 6e 61 6d 65 2d 68 |find-fil|e-name-h|
|00001790| 61 6e 64 6c 65 72 20 66 | 69 6e 64 2d 66 69 6c 65 |andler f|ind-file|
|000017a0| 2d 6e 6f 73 65 6c 65 63 | 74 20 66 69 6c 65 2d 6d |-noselec|t file-m|
|000017b0| 61 67 69 63 20 66 69 6c | 65 2d 6e 61 6d 65 2d 6e |agic fil|e-name-n|
|000017c0| 6f 6e 64 69 72 65 63 74 | 6f 72 79 20 74 65 6d 70 |ondirect|ory temp|
|000017d0| 2d 66 69 6c 65 2d 6e 61 | 6d 65 2d 70 72 65 66 69 |-file-na|me-prefi|
|000017e0| 78 20 66 69 6c 65 2d 72 | 65 61 64 61 62 6c 65 2d |x file-r|eadable-|
|000017f0| 70 20 65 72 72 6f 72 20 | 22 46 69 6c 65 20 60 25 |p error |"File `%|
|00001800| 73 27 20 64 6f 65 73 20 | 6e 6f 74 20 65 78 69 73 |s' does |not exis|
|00001810| 74 20 6f 72 20 69 73 20 | 6e 6f 74 20 72 65 61 64 |t or is |not read|
|00001820| 61 62 6c 65 22 20 66 69 | 6c 65 2d 64 69 72 65 63 |able" fi|le-direc|
|00001830| 74 6f 72 79 2d 70 20 22 | 46 69 6c 65 20 60 25 73 |tory-p "|File `%s|
|00001840| 27 20 69 73 20 61 20 64 | 69 72 65 63 74 6f 72 79 |' is a d|irectory|
|00001850| 22 20 65 78 70 61 6e 64 | 2d 66 69 6c 65 2d 6e 61 |" expand|-file-na|
|00001860| 6d 65 20 6c 61 73 74 2d | 64 69 72 20 66 69 6c 65 |me last-|dir file|
|00001870| 2d 6e 61 6d 65 2d 64 69 | 72 65 63 74 6f 72 79 20 |-name-di|rectory |
|00001880| 62 75 66 66 65 72 2d 6e | 61 6d 65 20 53 74 61 72 |buffer-n|ame Star|
|00001890| 74 42 75 66 66 65 72 20 | 67 65 74 2d 62 75 66 66 |tBuffer |get-buff|
|000018a0| 65 72 20 28 28 73 65 74 | 2d 62 75 66 66 65 72 20 |er ((set|-buffer |
|000018b0| 53 74 61 72 74 42 75 66 | 66 65 72 29 29 20 65 64 |StartBuf|fer)) ed|
|000018c0| 69 66 66 2d 76 65 72 69 | 66 79 2d 66 69 6c 65 2d |iff-veri|fy-file-|
|000018d0| 62 75 66 66 65 72 20 6d | 61 67 69 63 20 65 64 69 |buffer m|agic edi|
|000018e0| 66 66 2d 6d 61 6b 65 2d | 74 65 6d 70 2d 66 69 6c |ff-make-|temp-fil|
|000018f0| 65 20 68 6f 6f 6b 73 2d | 76 61 72 20 6c 61 6d 62 |e hooks-|var lamb|
|00001900| 64 61 20 6e 69 6c 20 64 | 65 6c 65 74 65 2d 66 69 |da nil d|elete-fi|
|00001910| 6c 65 20 66 69 6c 65 2d | 74 72 75 65 6e 61 6d 65 |le file-|truename|
|00001920| 20 62 75 66 66 65 72 2d | 66 69 6c 65 2d 6e 61 6d | buffer-|file-nam|
|00001930| 65 20 74 68 69 73 2d 63 | 6f 6d 6d 61 6e 64 20 65 |e this-c|ommand e|
|00001940| 64 69 66 66 2d 71 75 69 | 74 20 22 59 6f 75 27 76 |diff-qui|t "You'v|
|00001950| 65 20 6b 69 6c 6c 65 64 | 20 61 6e 20 65 73 73 65 |e killed| an esse|
|00001960| 6e 74 69 61 6c 20 45 64 | 69 66 66 20 62 75 66 66 |ntial Ed|iff buff|
|00001970| 65 72 2d 2d 2d 50 6c 65 | 61 73 65 20 71 75 69 74 |er---Ple|ase quit|
|00001980| 20 45 64 69 66 66 22 5d | 20 35 20 22 5c 0a 56 69 | Ediff"]| 5 "\.Vi|
|00001990| 73 69 74 20 46 49 4c 45 | 20 61 6e 64 20 61 72 72 |sit FILE| and arr|
|000019a0| 61 6e 67 65 20 69 74 73 | 20 62 75 66 66 65 72 20 |ange its| buffer |
|000019b0| 74 6f 20 45 64 69 66 66 | 27 73 20 6c 69 6b 69 6e |to Ediff|'s likin|
|000019c0| 67 2e 20 0a 46 49 4c 45 | 20 69 73 20 61 63 74 75 |g. .FILE| is actu|
|000019d0| 61 6c 6c 79 20 61 20 76 | 61 72 69 61 62 6c 65 20 |ally a v|ariable |
|000019e0| 73 79 6d 62 6f 6c 20 74 | 68 61 74 20 6d 75 73 74 |symbol t|hat must|
|000019f0| 20 63 6f 6e 74 61 69 6e | 20 61 20 74 72 75 65 20 | contain| a true |
|00001a00| 66 69 6c 65 20 6e 61 6d | 65 2e 0a 42 55 46 46 45 |file nam|e..BUFFE|
|00001a10| 52 2d 4e 41 4d 45 20 69 | 73 20 61 20 76 61 72 69 |R-NAME i|s a vari|
|00001a20| 61 62 6c 65 20 73 79 6d | 62 6f 6c 2c 20 77 68 69 |able sym|bol, whi|
|00001a30| 63 68 20 77 69 6c 6c 20 | 67 65 74 20 74 68 65 20 |ch will |get the |
|00001a40| 62 75 66 66 65 72 20 6f | 62 6a 65 63 74 20 69 6e |buffer o|bject in|
|00001a50| 74 6f 20 77 68 69 63 68 | 0a 46 49 4c 45 20 69 73 |to which|.FILE is|
|00001a60| 20 72 65 61 64 2e 20 20 | 4c 41 53 54 2d 44 49 52 | read. |LAST-DIR|
|00001a70| 20 69 73 20 74 68 65 20 | 64 69 72 65 63 74 6f 72 | is the |director|
|00001a80| 79 20 76 61 72 69 61 62 | 6c 65 20 73 79 6d 62 6f |y variab|le symbo|
|00001a90| 6c 20 77 68 65 72 65 20 | 46 49 4c 45 27 73 0a 64 |l where |FILE's.d|
|00001aa0| 69 72 65 63 74 6f 72 79 | 20 6e 61 6d 65 20 73 68 |irectory| name sh|
|00001ab0| 6f 75 6c 64 20 62 65 20 | 72 65 74 75 72 6e 65 64 |ould be |returned|
|00001ac0| 2e 20 48 4f 4f 4b 53 20 | 69 73 20 61 20 76 61 72 |. HOOKS |is a var|
|00001ad0| 69 61 62 6c 65 20 73 79 | 6d 62 6f 6c 20 74 68 61 |iable sy|mbol tha|
|00001ae0| 74 20 77 69 6c 6c 20 62 | 65 0a 61 73 73 69 67 6e |t will b|e.assign|
|00001af0| 65 64 20 74 68 65 20 68 | 6f 6f 6b 20 74 6f 20 62 |ed the h|ook to b|
|00001b00| 65 20 65 78 65 63 75 74 | 65 64 20 61 66 74 65 72 |e execut|ed after|
|00001b10| 20 60 65 64 69 66 66 2d | 73 74 61 72 74 75 70 27 | `ediff-|startup'|
|00001b20| 20 69 73 20 66 69 6e 69 | 73 68 65 64 2e 0a 60 65 | is fini|shed..`e|
|00001b30| 64 69 66 66 2d 66 69 6e | 64 2d 66 69 6c 65 27 20 |diff-fin|d-file' |
|00001b40| 61 72 72 61 6e 67 65 73 | 20 74 68 61 74 20 74 68 |arranges| that th|
|00001b50| 65 20 74 65 6d 70 20 66 | 69 6c 65 73 20 69 74 20 |e temp f|iles it |
|00001b60| 6d 69 67 68 74 20 63 72 | 65 61 74 65 20 77 69 6c |might cr|eate wil|
|00001b70| 6c 20 62 65 0a 64 65 6c | 65 74 65 64 2e 22 5d 29 |l be.del|eted."])|
|00001b80| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 4d |.(byte-c|ode "..M|
|00001b90| 88 c2 c3 c4 5c 22 87 22 | 20 5b 65 64 69 66 66 2d |....\"."| [ediff-|
|00001ba0| 66 69 6c 65 73 2d 69 6e | 74 65 72 6e 61 6c 20 23 |files-in|ternal #|
|00001bb0| 5b 28 66 69 6c 65 2d 41 | 20 66 69 6c 65 2d 42 20 |[(file-A| file-B |
|00001bc0| 66 69 6c 65 2d 43 20 73 | 74 61 72 74 75 70 2d 68 |file-C s|tartup-h|
|00001bd0| 6f 6f 6b 73 20 6a 6f 62 | 2d 6e 61 6d 65 29 20 22 |ooks job|-name) "|
|00001be0| c0 89 89 19 1a 1b c4 c5 | 0e 06 5c 22 88 c7 c6 c3 |........|..\"....|
|00001bf0| c8 c9 24 88 c4 c5 0e 5c | 6e 5c 22 88 c7 ca c2 cb |..$....\|n\".....|
|00001c00| c9 24 88 0e 0c 3b ab 96 | c4 c5 0e 0c 5c 22 88 c7 |.$...;..|....\"..|
|00001c10| cc c1 0e 0d ce 3d ab 83 | cf aa 81 d0 c9 24 88 d1 |.....=..|.....$..|
|00001c20| 0b 0e 06 5c 6e 0e 5c 6e | 09 0e 0c 0e 09 d2 0e 0d |...\n.\n|........|
|00001c30| 42 43 26 08 2b 87 22 20 | 5b 6e 69 6c 20 62 75 66 |BC&.+." |[nil buf|
|00001c40| 2d 43 20 62 75 66 2d 42 | 20 62 75 66 2d 41 20 6d |-C buf-B| buf-A m|
|00001c50| 65 73 73 61 67 65 20 22 | 52 65 61 64 69 6e 67 20 |essage "|Reading |
|00001c60| 66 69 6c 65 20 25 73 20 | 2e 2e 2e 20 22 20 66 69 |file %s |... " fi|
|00001c70| 6c 65 2d 41 20 65 64 69 | 66 66 2d 66 69 6e 64 2d |le-A edi|ff-find-|
|00001c80| 66 69 6c 65 20 65 64 69 | 66 66 2d 6c 61 73 74 2d |file edi|ff-last-|
|00001c90| 64 69 72 2d 41 20 73 74 | 61 72 74 75 70 2d 68 6f |dir-A st|artup-ho|
|00001ca0| 6f 6b 73 20 66 69 6c 65 | 2d 42 20 65 64 69 66 66 |oks file|-B ediff|
|00001cb0| 2d 6c 61 73 74 2d 64 69 | 72 2d 42 20 66 69 6c 65 |-last-di|r-B file|
|00001cc0| 2d 43 20 6a 6f 62 2d 6e | 61 6d 65 20 65 64 69 66 |-C job-n|ame edif|
|00001cd0| 66 2d 6d 65 72 67 65 2d | 66 69 6c 65 73 2d 77 69 |f-merge-|files-wi|
|00001ce0| 74 68 2d 61 6e 63 65 73 | 74 6f 72 20 65 64 69 66 |th-ances|tor edif|
|00001cf0| 66 2d 6c 61 73 74 2d 64 | 69 72 2d 61 6e 63 65 73 |f-last-d|ir-ances|
|00001d00| 74 6f 72 20 65 64 69 66 | 66 2d 6c 61 73 74 2d 64 |tor edif|f-last-d|
|00001d10| 69 72 2d 43 20 65 64 69 | 66 66 2d 73 65 74 75 70 |ir-C edi|ff-setup|
|00001d20| 20 65 64 69 66 66 2d 6a | 6f 62 2d 6e 61 6d 65 5d | ediff-j|ob-name]|
|00001d30| 20 31 30 5d 20 64 65 66 | 61 6c 69 61 73 20 65 64 | 10] def|alias ed|
|00001d40| 69 66 66 20 65 64 69 66 | 66 2d 66 69 6c 65 73 5d |iff edif|f-files]|
|00001d50| 20 33 29 0a 28 66 73 65 | 74 20 27 65 64 69 66 66 | 3).(fse|t 'ediff|
|00001d60| 2d 62 75 66 66 65 72 73 | 20 23 5b 28 62 75 66 66 |-buffers| #[(buff|
|00001d70| 65 72 2d 41 20 62 75 66 | 66 65 72 2d 42 20 26 6f |er-A buf|fer-B &o|
|00001d80| 70 74 69 6f 6e 61 6c 20 | 73 74 61 72 74 75 70 2d |ptional |startup-|
|00001d90| 68 6f 6f 6b 73 20 6a 6f | 62 2d 6e 61 6d 65 29 20 |hooks jo|b-name) |
|00001da0| 22 08 ac 82 c1 10 c2 0b | 0c c5 0e 06 08 25 87 22 |".......|.....%."|
|00001db0| 20 5b 6a 6f 62 2d 6e 61 | 6d 65 20 65 64 69 66 66 | [job-na|me ediff|
|00001dc0| 2d 62 75 66 66 65 72 73 | 20 65 64 69 66 66 2d 62 |-buffers| ediff-b|
|00001dd0| 75 66 66 65 72 73 2d 69 | 6e 74 65 72 6e 61 6c 20 |uffers-i|nternal |
|00001de0| 62 75 66 66 65 72 2d 41 | 20 62 75 66 66 65 72 2d |buffer-A| buffer-|
|00001df0| 42 20 6e 69 6c 20 73 74 | 61 72 74 75 70 2d 68 6f |B nil st|artup-ho|
|00001e00| 6f 6b 73 5d 20 36 20 22 | 5c 0a 52 75 6e 20 45 64 |oks] 6 "|\.Run Ed|
|00001e10| 69 66 66 20 6f 6e 20 61 | 20 70 61 69 72 20 6f 66 |iff on a| pair of|
|00001e20| 20 62 75 66 66 65 72 73 | 2c 20 42 55 46 46 45 52 | buffers|, BUFFER|
|00001e30| 2d 41 20 61 6e 64 20 42 | 55 46 46 45 52 2d 42 2e |-A and B|UFFER-B.|
|00001e40| 22 20 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 19 |" (byte-|code "..|
|00001e50| c2 c3 c4 c5 21 c6 23 89 | 11 c2 c7 c8 8b 88 c4 09 |....!.#.|........|
|00001e60| 21 c6 23 29 44 87 22 20 | 5b 6e 69 6c 20 62 66 20 |!.#)D." |[nil bf |
|00001e70| 72 65 61 64 2d 62 75 66 | 66 65 72 20 22 42 75 66 |read-buf|fer "Buf|
|00001e80| 66 65 72 20 41 20 74 6f | 20 63 6f 6d 70 61 72 65 |fer A to| compare|
|00001e90| 3a 20 22 20 65 64 69 66 | 66 2d 6f 74 68 65 72 2d |: " edif|f-other-|
|00001ea0| 62 75 66 66 65 72 20 22 | 22 20 74 20 22 42 75 66 |buffer "|" t "Buf|
|00001eb0| 66 65 72 20 42 20 74 6f | 20 63 6f 6d 70 61 72 65 |fer B to| compare|
|00001ec0| 3a 20 22 20 28 28 6f 74 | 68 65 72 2d 77 69 6e 64 |: " ((ot|her-wind|
|00001ed0| 6f 77 20 31 29 29 5d 20 | 35 29 5d 29 0a 28 66 73 |ow 1))] |5)]).(fs|
|00001ee0| 65 74 20 27 65 64 69 66 | 66 2d 62 75 66 66 65 72 |et 'edif|f-buffer|
|00001ef0| 73 33 20 23 5b 28 62 75 | 66 66 65 72 2d 41 20 62 |s3 #[(bu|ffer-A b|
|00001f00| 75 66 66 65 72 2d 42 20 | 62 75 66 66 65 72 2d 43 |uffer-B |buffer-C|
|00001f10| 20 26 6f 70 74 69 6f 6e | 61 6c 20 73 74 61 72 74 | &option|al start|
|00001f20| 75 70 2d 68 6f 6f 6b 73 | 20 6a 6f 62 2d 6e 61 6d |up-hooks| job-nam|
|00001f30| 65 29 20 22 08 ac 82 c1 | 10 c2 0b 0c 0d 0e 06 08 |e) "....|........|
|00001f40| 25 87 22 20 5b 6a 6f 62 | 2d 6e 61 6d 65 20 65 64 |%." [job|-name ed|
|00001f50| 69 66 66 2d 62 75 66 66 | 65 72 73 33 20 65 64 69 |iff-buff|ers3 edi|
|00001f60| 66 66 2d 62 75 66 66 65 | 72 73 2d 69 6e 74 65 72 |ff-buffe|rs-inter|
|00001f70| 6e 61 6c 20 62 75 66 66 | 65 72 2d 41 20 62 75 66 |nal buff|er-A buf|
|00001f80| 66 65 72 2d 42 20 62 75 | 66 66 65 72 2d 43 20 73 |fer-B bu|ffer-C s|
|00001f90| 74 61 72 74 75 70 2d 68 | 6f 6f 6b 73 5d 20 36 20 |tartup-h|ooks] 6 |
|00001fa0| 22 5c 0a 52 75 6e 20 45 | 64 69 66 66 20 6f 6e 20 |"\.Run E|diff on |
|00001fb0| 74 68 72 65 65 20 62 75 | 66 66 65 72 73 2c 20 42 |three bu|ffers, B|
|00001fc0| 55 46 46 45 52 2d 41 2c | 20 42 55 46 46 45 52 2d |UFFER-A,| BUFFER-|
|00001fd0| 42 2c 20 61 6e 64 20 42 | 55 46 46 45 52 2d 43 2e |B, and B|UFFER-C.|
|00001fe0| 22 20 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 89 |" (byte-|code "..|
|00001ff0| 19 1a c3 c4 c5 c6 21 c7 | 23 89 12 c3 c8 c9 8b 88 |......!.|#.......|
|00002000| c5 5c 6e 21 c7 23 89 11 | c3 ca cb 8b 88 c5 5c 6e |.\n!.#..|......\n|
|00002010| 09 44 21 c7 23 45 2a 87 | 22 20 5b 6e 69 6c 20 62 |.D!.#E*.|" [nil b|
|00002020| 66 66 20 62 66 20 72 65 | 61 64 2d 62 75 66 66 65 |ff bf re|ad-buffe|
|00002030| 72 20 22 42 75 66 66 65 | 72 20 41 20 74 6f 20 63 |r "Buffe|r A to c|
|00002040| 6f 6d 70 61 72 65 3a 20 | 22 20 65 64 69 66 66 2d |ompare: |" ediff-|
|00002050| 6f 74 68 65 72 2d 62 75 | 66 66 65 72 20 22 22 20 |other-bu|ffer "" |
|00002060| 74 20 22 42 75 66 66 65 | 72 20 42 20 74 6f 20 63 |t "Buffe|r B to c|
|00002070| 6f 6d 70 61 72 65 3a 20 | 22 20 28 28 6f 74 68 65 |ompare: |" ((othe|
|00002080| 72 2d 77 69 6e 64 6f 77 | 20 31 29 29 20 22 42 75 |r-window| 1)) "Bu|
|00002090| 66 66 65 72 20 43 20 74 | 6f 20 63 6f 6d 70 61 72 |ffer C t|o compar|
|000020a0| 65 3a 20 22 20 28 28 6f | 74 68 65 72 2d 77 69 6e |e: " ((o|ther-win|
|000020b0| 64 6f 77 20 31 29 29 5d | 20 37 29 5d 29 0a 28 66 |dow 1))]| 7)]).(f|
|000020c0| 73 65 74 20 27 65 64 69 | 66 66 2d 62 75 66 66 65 |set 'edi|ff-buffe|
|000020d0| 72 73 2d 69 6e 74 65 72 | 6e 61 6c 20 23 5b 28 62 |rs-inter|nal #[(b|
|000020e0| 75 66 2d 41 20 62 75 66 | 2d 42 20 62 75 66 2d 43 |uf-A buf|-B buf-C|
|000020f0| 20 73 74 61 72 74 75 70 | 2d 68 6f 6f 6b 73 20 6a | startup|-hooks j|
|00002100| 6f 62 2d 6e 61 6d 65 29 | 20 22 c0 c1 5c 6e 21 21 |ob-name)| "..\n!!|
|00002110| 1b c0 c1 0c 21 21 1d 0e | 06 ad 8c c1 0e 06 21 ad |....!!..|......!.|
|00002120| 86 c7 c1 0e 06 21 21 89 | 1e 08 ad 85 c0 c1 0c 21 |.....!!.|.......!|
|00002130| 21 1e 09 ca 1e 0b ca 1e | 0c ca 1e 0d 5c 6e ab 8c |!.......|....\n..|
|00002140| c1 5c 6e 21 ab 87 c7 c1 | 5c 6e 21 21 ac 85 ce cf |.\n!....|\n!!....|
|00002150| 5c 6e 5c 22 88 0c ab 8c | c1 0c 21 ab 87 c7 c1 0c |\n\"....|..!.....|
|00002160| 21 21 ac 85 ce cf 0c 5c | 22 88 0e 10 1e 11 0e 12 |!!.....\|".......|
|00002170| ab 8a 0e 08 ac 86 ce cf | 0e 06 5c 22 88 29 0b 3b |........|..\".).;|
|00002180| ab 84 d3 0b 21 13 0d 3b | ab 84 d3 0d 21 15 0e 09 |....!..;|....!...|
|00002190| 3b ab 86 d3 0e 09 21 16 | 09 d4 5c 6e 0b 5c 22 16 |;.....!.|..\n.\".|
|000021a0| 0b d4 0c 0d 5c 22 16 0c | 0e 08 ab 88 d4 0e 06 0e |....\"..|........|
|000021b0| 09 5c 22 16 0d d5 c1 5c | 6e 21 0e 0b c1 0c 21 0e |.\"....\|n!....!.|
|000021c0| 0c 0e 08 ad 84 c1 0e 06 | 21 0e 0d d6 ca d7 0e 0b |........|!.......|
|000021d0| 44 d7 0e 0c 44 d8 d9 0e | 0d 44 d7 0e 0d 44 45 af |D...D...|.D...DE.|
|000021e0| 05 0e 1a 42 d1 0e 10 42 | 43 26 08 2e 07 87 22 20 |...B...B|C&...." |
|000021f0| 5b 62 75 66 66 65 72 2d | 66 69 6c 65 2d 6e 61 6d |[buffer-|file-nam|
|00002200| 65 20 67 65 74 2d 62 75 | 66 66 65 72 20 62 75 66 |e get-bu|ffer buf|
|00002210| 2d 41 20 62 75 66 2d 41 | 2d 66 69 6c 65 2d 6e 61 |-A buf-A|-file-na|
|00002220| 6d 65 20 62 75 66 2d 42 | 20 62 75 66 2d 42 2d 66 |me buf-B| buf-B-f|
|00002230| 69 6c 65 2d 6e 61 6d 65 | 20 62 75 66 2d 43 20 62 |ile-name| buf-C b|
|00002240| 75 66 66 65 72 2d 6e 61 | 6d 65 20 62 75 66 2d 43 |uffer-na|me buf-C|
|00002250| 2d 69 73 2d 61 6c 69 76 | 65 20 62 75 66 2d 43 2d |-is-aliv|e buf-C-|
|00002260| 66 69 6c 65 2d 6e 61 6d | 65 20 6e 69 6c 20 66 69 |file-nam|e nil fi|
|00002270| 6c 65 2d 41 20 66 69 6c | 65 2d 42 20 66 69 6c 65 |le-A fil|e-B file|
|00002280| 2d 43 20 65 72 72 6f 72 | 20 22 42 75 66 66 65 72 |-C error| "Buffer|
|00002290| 20 25 53 20 64 6f 65 73 | 6e 27 74 20 65 78 69 73 | %S does|n't exis|
|000022a0| 74 22 20 6a 6f 62 2d 6e | 61 6d 65 20 65 64 69 66 |t" job-n|ame edif|
|000022b0| 66 2d 6a 6f 62 2d 6e 61 | 6d 65 20 65 64 69 66 66 |f-job-na|me ediff|
|000022c0| 2d 33 77 61 79 2d 63 6f | 6d 70 61 72 69 73 6f 6e |-3way-co|mparison|
|000022d0| 2d 6a 6f 62 20 66 69 6c | 65 2d 6e 61 6d 65 2d 6e |-job fil|e-name-n|
|000022e0| 6f 6e 64 69 72 65 63 74 | 6f 72 79 20 65 64 69 66 |ondirect|ory edif|
|000022f0| 66 2d 6d 61 6b 65 2d 74 | 65 6d 70 2d 66 69 6c 65 |f-make-t|emp-file|
|00002300| 20 65 64 69 66 66 2d 73 | 65 74 75 70 20 6c 61 6d | ediff-s|etup lam|
|00002310| 62 64 61 20 64 65 6c 65 | 74 65 2d 66 69 6c 65 20 |bda dele|te-file |
|00002320| 69 66 20 73 74 72 69 6e | 67 70 20 73 74 61 72 74 |if strin|gp start|
|00002330| 75 70 2d 68 6f 6f 6b 73 | 5d 20 31 36 5d 29 0a 28 |up-hooks|] 16]).(|
|00002340| 66 73 65 74 20 27 65 64 | 69 66 66 2d 64 69 72 65 |fset 'ed|iff-dire|
|00002350| 63 74 6f 72 69 65 73 20 | 23 5b 28 64 69 72 31 20 |ctories |#[(dir1 |
|00002360| 64 69 72 32 20 72 65 67 | 65 78 70 29 20 22 c0 09 |dir2 reg|exp) "..|
|00002370| 5c 6e c3 0c c5 c6 26 06 | 87 22 20 5b 65 64 69 66 |\n....&.|." [edif|
|00002380| 66 2d 64 69 72 65 63 74 | 6f 72 69 65 73 2d 69 6e |f-direct|ories-in|
|00002390| 74 65 72 6e 61 6c 20 64 | 69 72 31 20 64 69 72 32 |ternal d|ir1 dir2|
|000023a0| 20 6e 69 6c 20 72 65 67 | 65 78 70 20 65 64 69 66 | nil reg|exp edif|
|000023b0| 66 2d 66 69 6c 65 73 20 | 65 64 69 66 66 2d 64 69 |f-files |ediff-di|
|000023c0| 72 65 63 74 6f 72 69 65 | 73 5d 20 37 20 22 5c 0a |rectorie|s] 7 "\.|
|000023d0| 52 75 6e 20 45 64 69 66 | 66 20 6f 6e 20 61 20 70 |Run Edif|f on a p|
|000023e0| 61 69 72 20 6f 66 20 64 | 69 72 65 63 74 6f 72 69 |air of d|irectori|
|000023f0| 65 73 2c 20 44 49 52 31 | 20 61 6e 64 20 44 49 52 |es, DIR1| and DIR|
|00002400| 32 2c 20 63 6f 6d 70 61 | 72 69 6e 67 20 66 69 6c |2, compa|ring fil|
|00002410| 65 73 20 74 68 61 74 20 | 68 61 76 65 0a 74 68 65 |es that |have.the|
|00002420| 20 73 61 6d 65 20 6e 61 | 6d 65 20 69 6e 20 62 6f | same na|me in bo|
|00002430| 74 68 2e 20 54 68 65 20 | 74 68 69 72 64 20 61 72 |th. The |third ar|
|00002440| 67 75 6d 65 6e 74 2c 20 | 52 45 47 45 58 50 2c 20 |gument, |REGEXP, |
|00002450| 69 73 20 61 20 72 65 67 | 75 6c 61 72 20 65 78 70 |is a reg|ular exp|
|00002460| 72 65 73 73 69 6f 6e 20 | 74 68 61 74 0a 66 75 72 |ression |that.fur|
|00002470| 74 68 65 72 20 66 69 6c | 74 65 72 73 20 74 68 65 |ther fil|ters the|
|00002480| 20 66 69 6c 65 20 6e 61 | 6d 65 73 2e 22 20 28 62 | file na|mes." (b|
|00002490| 79 74 65 2d 63 6f 64 65 | 20 22 08 ab 83 09 aa 81 |yte-code| "......|
|000024a0| 5c 6e c3 1c 1d c6 c7 0d | c3 23 89 14 c6 c8 08 ab |\n......|.#......|
|000024b0| 84 0e 09 aa 83 ca 0c 21 | c3 23 cb cc c3 0e 0d 23 |.......!|.#.....#|
|000024c0| 45 2a 87 22 20 5b 65 64 | 69 66 66 2d 75 73 65 2d |E*." [ed|iff-use-|
|000024d0| 6c 61 73 74 2d 64 69 72 | 20 65 64 69 66 66 2d 6c |last-dir| ediff-l|
|000024e0| 61 73 74 2d 64 69 72 2d | 41 20 64 65 66 61 75 6c |ast-dir-|A defaul|
|000024f0| 74 2d 64 69 72 65 63 74 | 6f 72 79 20 6e 69 6c 20 |t-direct|ory nil |
|00002500| 66 20 64 69 72 2d 41 20 | 65 64 69 66 66 2d 72 65 |f dir-A |ediff-re|
|00002510| 61 64 2d 66 69 6c 65 2d | 6e 61 6d 65 20 22 44 69 |ad-file-|name "Di|
|00002520| 72 65 63 74 6f 72 79 20 | 41 20 74 6f 20 63 6f 6d |rectory |A to com|
|00002530| 70 61 72 65 22 20 22 44 | 69 72 65 63 74 6f 72 79 |pare" "D|irectory|
|00002540| 20 42 20 74 6f 20 63 6f | 6d 70 61 72 65 22 20 65 | B to co|mpare" e|
|00002550| 64 69 66 66 2d 6c 61 73 | 74 2d 64 69 72 2d 42 20 |diff-las|t-dir-B |
|00002560| 65 64 69 66 66 2d 73 74 | 72 69 70 2d 6c 61 73 74 |ediff-st|rip-last|
|00002570| 2d 64 69 72 20 72 65 61 | 64 2d 73 74 72 69 6e 67 |-dir rea|d-string|
|00002580| 20 22 46 69 6c 74 65 72 | 20 74 68 72 6f 75 67 68 | "Filter| through|
|00002590| 20 72 65 67 75 6c 61 72 | 20 65 78 70 72 65 73 73 | regular| express|
|000025a0| 69 6f 6e 3a 20 22 20 65 | 64 69 66 66 2d 66 69 6c |ion: " e|diff-fil|
|000025b0| 74 65 72 69 6e 67 2d 72 | 65 67 65 78 70 2d 68 69 |tering-r|egexp-hi|
|000025c0| 73 74 6f 72 79 5d 20 36 | 29 5d 29 0a 28 64 65 66 |story] 6|)]).(def|
|000025d0| 61 6c 69 61 73 20 27 65 | 64 69 72 73 20 27 65 64 |alias 'e|dirs 'ed|
|000025e0| 69 66 66 2d 64 69 72 65 | 63 74 6f 72 69 65 73 29 |iff-dire|ctories)|
|000025f0| 0a 28 66 73 65 74 20 27 | 65 64 69 66 66 2d 64 69 |.(fset '|ediff-di|
|00002600| 72 65 63 74 6f 72 79 2d | 72 65 76 69 73 69 6f 6e |rectory-|revision|
|00002610| 73 20 23 5b 28 64 69 72 | 31 20 72 65 67 65 78 70 |s #[(dir|1 regexp|
|00002620| 29 20 22 c0 09 5c 6e c3 | c4 24 87 22 20 5b 65 64 |) "..\n.|.$." [ed|
|00002630| 69 66 66 2d 64 69 72 65 | 63 74 6f 72 79 2d 72 65 |iff-dire|ctory-re|
|00002640| 76 69 73 69 6f 6e 73 2d | 69 6e 74 65 72 6e 61 6c |visions-|internal|
|00002650| 20 64 69 72 31 20 72 65 | 67 65 78 70 20 65 64 69 | dir1 re|gexp edi|
|00002660| 66 66 2d 72 65 76 69 73 | 69 6f 6e 20 65 64 69 66 |ff-revis|ion edif|
|00002670| 66 2d 64 69 72 65 63 74 | 6f 72 79 2d 72 65 76 69 |f-direct|ory-revi|
|00002680| 73 69 6f 6e 73 5d 20 35 | 20 22 5c 0a 52 75 6e 20 |sions] 5| "\.Run |
|00002690| 45 64 69 66 66 20 6f 6e | 20 61 20 64 69 72 65 63 |Ediff on| a direc|
|000026a0| 74 6f 72 79 2c 20 44 49 | 52 31 2c 20 63 6f 6d 70 |tory, DI|R1, comp|
|000026b0| 61 72 69 6e 67 20 69 74 | 73 20 66 69 6c 65 73 20 |aring it|s files |
|000026c0| 77 69 74 68 20 74 68 65 | 69 72 20 72 65 76 69 73 |with the|ir revis|
|000026d0| 69 6f 6e 73 2e 0a 54 68 | 65 20 73 65 63 6f 6e 64 |ions..Th|e second|
|000026e0| 20 61 72 67 75 6d 65 6e | 74 2c 20 52 45 47 45 58 | argumen|t, REGEX|
|000026f0| 50 2c 20 69 73 20 61 20 | 72 65 67 75 6c 61 72 20 |P, is a |regular |
|00002700| 65 78 70 72 65 73 73 69 | 6f 6e 20 74 68 61 74 20 |expressi|on that |
|00002710| 66 69 6c 74 65 72 73 20 | 74 68 65 20 66 69 6c 65 |filters |the file|
|00002720| 0a 6e 61 6d 65 73 2e 20 | 4f 6e 6c 79 20 74 68 65 |.names. |Only the|
|00002730| 20 66 69 6c 65 73 20 74 | 68 61 74 20 61 72 65 20 | files t|hat are |
|00002740| 75 6e 64 65 72 20 72 65 | 76 69 73 69 6f 6e 20 63 |under re|vision c|
|00002750| 6f 6e 74 72 6f 6c 20 61 | 72 65 20 74 61 6b 65 6e |ontrol a|re taken|
|00002760| 20 69 6e 74 6f 20 61 63 | 63 6f 75 6e 74 2e 22 20 | into ac|count." |
|00002770| 28 62 79 74 65 2d 63 6f | 64 65 20 22 08 ab 83 09 |(byte-co|de "....|
|00002780| aa 81 5c 6e 1b c4 c5 0b | c6 23 c7 c8 c6 0e 09 23 |..\n....|.#.....#|
|00002790| 29 44 87 22 20 5b 65 64 | 69 66 66 2d 75 73 65 2d |)D." [ed|iff-use-|
|000027a0| 6c 61 73 74 2d 64 69 72 | 20 65 64 69 66 66 2d 6c |last-dir| ediff-l|
|000027b0| 61 73 74 2d 64 69 72 2d | 41 20 64 65 66 61 75 6c |ast-dir-|A defaul|
|000027c0| 74 2d 64 69 72 65 63 74 | 6f 72 79 20 64 69 72 2d |t-direct|ory dir-|
|000027d0| 41 20 65 64 69 66 66 2d | 72 65 61 64 2d 66 69 6c |A ediff-|read-fil|
|000027e0| 65 2d 6e 61 6d 65 20 22 | 44 69 72 65 63 74 6f 72 |e-name "|Director|
|000027f0| 79 20 74 6f 20 63 6f 6d | 70 61 72 65 20 77 69 74 |y to com|pare wit|
|00002800| 68 20 72 65 76 69 73 69 | 6f 6e 22 20 6e 69 6c 20 |h revisi|on" nil |
|00002810| 72 65 61 64 2d 73 74 72 | 69 6e 67 20 22 46 69 6c |read-str|ing "Fil|
|00002820| 74 65 72 20 74 68 72 6f | 75 67 68 20 72 65 67 75 |ter thro|ugh regu|
|00002830| 6c 61 72 20 65 78 70 72 | 65 73 73 69 6f 6e 3a 20 |lar expr|ession: |
|00002840| 22 20 65 64 69 66 66 2d | 66 69 6c 74 65 72 69 6e |" ediff-|filterin|
|00002850| 67 2d 72 65 67 65 78 70 | 2d 68 69 73 74 6f 72 79 |g-regexp|-history|
|00002860| 5d 20 35 29 5d 29 0a 28 | 64 65 66 61 6c 69 61 73 |] 5)]).(|defalias|
|00002870| 20 27 65 64 69 72 2d 72 | 65 76 69 73 69 6f 6e 73 | 'edir-r|evisions|
|00002880| 20 27 65 64 69 66 66 2d | 64 69 72 65 63 74 6f 72 | 'ediff-|director|
|00002890| 79 2d 72 65 76 69 73 69 | 6f 6e 73 29 0a 28 66 73 |y-revisi|ons).(fs|
|000028a0| 65 74 20 27 65 64 69 66 | 66 2d 64 69 72 65 63 74 |et 'edif|f-direct|
|000028b0| 6f 72 69 65 73 33 20 23 | 5b 28 64 69 72 31 20 64 |ories3 #|[(dir1 d|
|000028c0| 69 72 32 20 64 69 72 33 | 20 72 65 67 65 78 70 29 |ir2 dir3| regexp)|
|000028d0| 20 22 c0 09 5c 6e 0b 0c | c5 c6 26 06 87 22 20 5b | "..\n..|..&.." [|
|000028e0| 65 64 69 66 66 2d 64 69 | 72 65 63 74 6f 72 69 65 |ediff-di|rectorie|
|000028f0| 73 2d 69 6e 74 65 72 6e | 61 6c 20 64 69 72 31 20 |s-intern|al dir1 |
|00002900| 64 69 72 32 20 64 69 72 | 33 20 72 65 67 65 78 70 |dir2 dir|3 regexp|
|00002910| 20 65 64 69 66 66 2d 66 | 69 6c 65 73 33 20 65 64 | ediff-f|iles3 ed|
|00002920| 69 66 66 2d 64 69 72 65 | 63 74 6f 72 69 65 73 33 |iff-dire|ctories3|
|00002930| 5d 20 37 20 22 5c 0a 52 | 75 6e 20 45 64 69 66 66 |] 7 "\.R|un Ediff|
|00002940| 20 6f 6e 20 74 68 72 65 | 65 20 64 69 72 65 63 74 | on thre|e direct|
|00002950| 6f 72 69 65 73 2c 20 44 | 49 52 31 2c 20 44 49 52 |ories, D|IR1, DIR|
|00002960| 32 2c 20 61 6e 64 20 44 | 49 52 33 2c 20 63 6f 6d |2, and D|IR3, com|
|00002970| 70 61 72 69 6e 67 20 66 | 69 6c 65 73 20 74 68 61 |paring f|iles tha|
|00002980| 74 0a 68 61 76 65 20 74 | 68 65 20 73 61 6d 65 20 |t.have t|he same |
|00002990| 6e 61 6d 65 20 69 6e 20 | 61 6c 6c 20 74 68 72 65 |name in |all thre|
|000029a0| 65 2e 20 54 68 65 20 6c | 61 73 74 20 61 72 67 75 |e. The l|ast argu|
|000029b0| 6d 65 6e 74 2c 20 52 45 | 47 45 58 50 2c 20 69 73 |ment, RE|GEXP, is|
|000029c0| 20 61 20 72 65 67 75 6c | 61 72 0a 65 78 70 72 65 | a regul|ar.expre|
|000029d0| 73 73 69 6f 6e 20 74 68 | 61 74 20 66 75 72 74 68 |ssion th|at furth|
|000029e0| 65 72 20 66 69 6c 74 65 | 72 73 20 74 68 65 20 66 |er filte|rs the f|
|000029f0| 69 6c 65 20 6e 61 6d 65 | 73 2e 22 20 28 62 79 74 |ile name|s." (byt|
|00002a00| 65 2d 63 6f 64 65 20 22 | 08 ab 83 09 aa 81 5c 6e |e-code "|......\n|
|00002a10| c3 1c 1d c6 c7 0d c3 23 | 89 14 c6 c8 08 ab 84 0e |.......#|........|
|00002a20| 09 aa 83 ca 0c 21 c3 23 | 89 14 c6 cb 08 ab 84 0e |.....!.#|........|
|00002a30| 0c aa 83 ca 0c 21 c3 23 | cd ce c3 0e 0f 23 46 2a |.....!.#|.....#F*|
|00002a40| 87 22 20 5b 65 64 69 66 | 66 2d 75 73 65 2d 6c 61 |." [edif|f-use-la|
|00002a50| 73 74 2d 64 69 72 20 65 | 64 69 66 66 2d 6c 61 73 |st-dir e|diff-las|
|00002a60| 74 2d 64 69 72 2d 41 20 | 64 65 66 61 75 6c 74 2d |t-dir-A |default-|
|00002a70| 64 69 72 65 63 74 6f 72 | 79 20 6e 69 6c 20 66 20 |director|y nil f |
|00002a80| 64 69 72 2d 41 20 65 64 | 69 66 66 2d 72 65 61 64 |dir-A ed|iff-read|
|00002a90| 2d 66 69 6c 65 2d 6e 61 | 6d 65 20 22 44 69 72 65 |-file-na|me "Dire|
|00002aa0| 63 74 6f 72 79 20 41 20 | 74 6f 20 63 6f 6d 70 61 |ctory A |to compa|
|00002ab0| 72 65 22 20 22 44 69 72 | 65 63 74 6f 72 79 20 42 |re" "Dir|ectory B|
|00002ac0| 20 74 6f 20 63 6f 6d 70 | 61 72 65 22 20 65 64 69 | to comp|are" edi|
|00002ad0| 66 66 2d 6c 61 73 74 2d | 64 69 72 2d 42 20 65 64 |ff-last-|dir-B ed|
|00002ae0| 69 66 66 2d 73 74 72 69 | 70 2d 6c 61 73 74 2d 64 |iff-stri|p-last-d|
|00002af0| 69 72 20 22 44 69 72 65 | 63 74 6f 72 79 20 43 20 |ir "Dire|ctory C |
|00002b00| 74 6f 20 63 6f 6d 70 61 | 72 65 22 20 65 64 69 66 |to compa|re" edif|
|00002b10| 66 2d 6c 61 73 74 2d 64 | 69 72 2d 43 20 72 65 61 |f-last-d|ir-C rea|
|00002b20| 64 2d 73 74 72 69 6e 67 | 20 22 46 69 6c 74 65 72 |d-string| "Filter|
|00002b30| 20 74 68 72 6f 75 67 68 | 20 72 65 67 75 6c 61 72 | through| regular|
|00002b40| 20 65 78 70 72 65 73 73 | 69 6f 6e 3a 20 22 20 65 | express|ion: " e|
|00002b50| 64 69 66 66 2d 66 69 6c | 74 65 72 69 6e 67 2d 72 |diff-fil|tering-r|
|00002b60| 65 67 65 78 70 2d 68 69 | 73 74 6f 72 79 5d 20 37 |egexp-hi|story] 7|
|00002b70| 29 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |)]).(def|alias 'e|
|00002b80| 64 69 72 73 33 20 27 65 | 64 69 66 66 2d 64 69 72 |dirs3 'e|diff-dir|
|00002b90| 65 63 74 6f 72 69 65 73 | 33 29 0a 28 66 73 65 74 |ectories|3).(fset|
|00002ba0| 20 27 65 64 69 66 66 2d | 6d 65 72 67 65 2d 64 69 | 'ediff-|merge-di|
|00002bb0| 72 65 63 74 6f 72 69 65 | 73 20 23 5b 28 64 69 72 |rectorie|s #[(dir|
|00002bc0| 31 20 64 69 72 32 20 72 | 65 67 65 78 70 29 20 22 |1 dir2 r|egexp) "|
|00002bd0| c0 09 5c 6e c3 0c c5 c6 | 26 06 87 22 20 5b 65 64 |..\n....|&.." [ed|
|00002be0| 69 66 66 2d 64 69 72 65 | 63 74 6f 72 69 65 73 2d |iff-dire|ctories-|
|00002bf0| 69 6e 74 65 72 6e 61 6c | 20 64 69 72 31 20 64 69 |internal| dir1 di|
|00002c00| 72 32 20 6e 69 6c 20 72 | 65 67 65 78 70 20 65 64 |r2 nil r|egexp ed|
|00002c10| 69 66 66 2d 6d 65 72 67 | 65 2d 66 69 6c 65 73 20 |iff-merg|e-files |
|00002c20| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 64 69 72 65 |ediff-me|rge-dire|
|00002c30| 63 74 6f 72 69 65 73 5d | 20 37 20 22 5c 0a 52 75 |ctories]| 7 "\.Ru|
|00002c40| 6e 20 45 64 69 66 66 20 | 6f 6e 20 61 20 70 61 69 |n Ediff |on a pai|
|00002c50| 72 20 6f 66 20 64 69 72 | 65 63 74 6f 72 69 65 73 |r of dir|ectories|
|00002c60| 2c 20 44 49 52 31 20 61 | 6e 64 20 44 49 52 32 2c |, DIR1 a|nd DIR2,|
|00002c70| 20 6d 65 72 67 69 6e 67 | 20 66 69 6c 65 73 20 74 | merging| files t|
|00002c80| 68 61 74 20 68 61 76 65 | 0a 74 68 65 20 73 61 6d |hat have|.the sam|
|00002c90| 65 20 6e 61 6d 65 20 69 | 6e 20 62 6f 74 68 2e 20 |e name i|n both. |
|00002ca0| 54 68 65 20 74 68 69 72 | 64 20 61 72 67 75 6d 65 |The thir|d argume|
|00002cb0| 6e 74 2c 20 52 45 47 45 | 58 50 2c 20 69 73 20 61 |nt, REGE|XP, is a|
|00002cc0| 20 72 65 67 75 6c 61 72 | 20 65 78 70 72 65 73 73 | regular| express|
|00002cd0| 69 6f 6e 20 74 68 61 74 | 0a 66 75 72 74 68 65 72 |ion that|.further|
|00002ce0| 20 66 69 6c 74 65 72 73 | 20 74 68 65 20 66 69 6c | filters| the fil|
|00002cf0| 65 20 6e 61 6d 65 73 2e | 22 20 28 62 79 74 65 2d |e names.|" (byte-|
|00002d00| 63 6f 64 65 20 22 08 ab | 83 09 aa 81 5c 6e c3 1c |code "..|....\n..|
|00002d10| 1d c6 c7 0d c3 23 89 14 | c6 c8 08 ab 84 0e 09 aa |.....#..|........|
|00002d20| 83 ca 0c 21 c3 23 cb cc | c3 0e 0d 23 45 2a 87 22 |...!.#..|...#E*."|
|00002d30| 20 5b 65 64 69 66 66 2d | 75 73 65 2d 6c 61 73 74 | [ediff-|use-last|
|00002d40| 2d 64 69 72 20 65 64 69 | 66 66 2d 6c 61 73 74 2d |-dir edi|ff-last-|
|00002d50| 64 69 72 2d 41 20 64 65 | 66 61 75 6c 74 2d 64 69 |dir-A de|fault-di|
|00002d60| 72 65 63 74 6f 72 79 20 | 6e 69 6c 20 66 20 64 69 |rectory |nil f di|
|00002d70| 72 2d 41 20 65 64 69 66 | 66 2d 72 65 61 64 2d 66 |r-A edif|f-read-f|
|00002d80| 69 6c 65 2d 6e 61 6d 65 | 20 22 44 69 72 65 63 74 |ile-name| "Direct|
|00002d90| 6f 72 79 20 41 20 74 6f | 20 6d 65 72 67 65 22 20 |ory A to| merge" |
|00002da0| 22 44 69 72 65 63 74 6f | 72 79 20 42 20 74 6f 20 |"Directo|ry B to |
|00002db0| 6d 65 72 67 65 22 20 65 | 64 69 66 66 2d 6c 61 73 |merge" e|diff-las|
|00002dc0| 74 2d 64 69 72 2d 42 20 | 65 64 69 66 66 2d 73 74 |t-dir-B |ediff-st|
|00002dd0| 72 69 70 2d 6c 61 73 74 | 2d 64 69 72 20 72 65 61 |rip-last|-dir rea|
|00002de0| 64 2d 73 74 72 69 6e 67 | 20 22 46 69 6c 74 65 72 |d-string| "Filter|
|00002df0| 20 74 68 72 6f 75 67 68 | 20 72 65 67 75 6c 61 72 | through| regular|
|00002e00| 20 65 78 70 72 65 73 73 | 69 6f 6e 3a 20 22 20 65 | express|ion: " e|
|00002e10| 64 69 66 66 2d 66 69 6c | 74 65 72 69 6e 67 2d 72 |diff-fil|tering-r|
|00002e20| 65 67 65 78 70 2d 68 69 | 73 74 6f 72 79 5d 20 36 |egexp-hi|story] 6|
|00002e30| 29 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |)]).(def|alias 'e|
|00002e40| 64 69 72 73 2d 6d 65 72 | 67 65 20 27 65 64 69 66 |dirs-mer|ge 'edif|
|00002e50| 66 2d 6d 65 72 67 65 2d | 64 69 72 65 63 74 6f 72 |f-merge-|director|
|00002e60| 69 65 73 29 0a 28 66 73 | 65 74 20 27 65 64 69 66 |ies).(fs|et 'edif|
|00002e70| 66 2d 6d 65 72 67 65 2d | 64 69 72 65 63 74 6f 72 |f-merge-|director|
|00002e80| 69 65 73 2d 77 69 74 68 | 2d 61 6e 63 65 73 74 6f |ies-with|-ancesto|
|00002e90| 72 20 23 5b 28 64 69 72 | 31 20 64 69 72 32 20 64 |r #[(dir|1 dir2 d|
|00002ea0| 69 72 33 20 72 65 67 65 | 78 70 29 20 22 c0 09 5c |ir3 rege|xp) "..\|
|00002eb0| 6e 0b 0c c5 c6 26 06 87 | 22 20 5b 65 64 69 66 66 |n....&..|" [ediff|
|00002ec0| 2d 64 69 72 65 63 74 6f | 72 69 65 73 2d 69 6e 74 |-directo|ries-int|
|00002ed0| 65 72 6e 61 6c 20 64 69 | 72 31 20 64 69 72 32 20 |ernal di|r1 dir2 |
|00002ee0| 64 69 72 33 20 72 65 67 | 65 78 70 20 65 64 69 66 |dir3 reg|exp edif|
|00002ef0| 66 2d 6d 65 72 67 65 2d | 66 69 6c 65 73 2d 77 69 |f-merge-|files-wi|
|00002f00| 74 68 2d 61 6e 63 65 73 | 74 6f 72 20 65 64 69 66 |th-ances|tor edif|
|00002f10| 66 2d 6d 65 72 67 65 2d | 64 69 72 65 63 74 6f 72 |f-merge-|director|
|00002f20| 69 65 73 2d 77 69 74 68 | 2d 61 6e 63 65 73 74 6f |ies-with|-ancesto|
|00002f30| 72 5d 20 37 20 22 5c 0a | 52 75 6e 20 45 64 69 66 |r] 7 "\.|Run Edif|
|00002f40| 66 20 6f 6e 20 61 20 70 | 61 69 72 20 6f 66 20 64 |f on a p|air of d|
|00002f50| 69 72 65 63 74 6f 72 69 | 65 73 2c 20 44 49 52 31 |irectori|es, DIR1|
|00002f60| 20 61 6e 64 20 44 49 52 | 32 2c 20 6d 65 72 67 69 | and DIR|2, mergi|
|00002f70| 6e 67 20 66 69 6c 65 73 | 20 74 68 61 74 20 68 61 |ng files| that ha|
|00002f80| 76 65 0a 74 68 65 20 73 | 61 6d 65 20 6e 61 6d 65 |ve.the s|ame name|
|00002f90| 20 69 6e 20 62 6f 74 68 | 2e 20 54 68 65 20 74 68 | in both|. The th|
|00002fa0| 69 72 64 20 61 72 67 75 | 6d 65 6e 74 2c 20 52 45 |ird argu|ment, RE|
|00002fb0| 47 45 58 50 2c 20 69 73 | 20 61 20 72 65 67 75 6c |GEXP, is| a regul|
|00002fc0| 61 72 20 65 78 70 72 65 | 73 73 69 6f 6e 20 74 68 |ar expre|ssion th|
|00002fd0| 61 74 0a 66 75 72 74 68 | 65 72 20 66 69 6c 74 65 |at.furth|er filte|
|00002fe0| 72 73 20 74 68 65 20 66 | 69 6c 65 20 6e 61 6d 65 |rs the f|ile name|
|00002ff0| 73 2e 22 20 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |s." (byt|e-code "|
|00003000| 08 ab 83 09 aa 81 5c 6e | c3 1c 1d c6 c7 0d c3 23 |......\n|.......#|
|00003010| 89 14 c6 c8 08 ab 84 0e | 09 aa 83 ca 0c 21 c3 23 |........|.....!.#|
|00003020| 89 14 c6 cb 08 ab 84 0e | 0c aa 83 ca 0c 21 c3 23 |........|.....!.#|
|00003030| cd ce c3 0e 0f 23 46 2a | 87 22 20 5b 65 64 69 66 |.....#F*|." [edif|
|00003040| 66 2d 75 73 65 2d 6c 61 | 73 74 2d 64 69 72 20 65 |f-use-la|st-dir e|
|00003050| 64 69 66 66 2d 6c 61 73 | 74 2d 64 69 72 2d 41 20 |diff-las|t-dir-A |
|00003060| 64 65 66 61 75 6c 74 2d | 64 69 72 65 63 74 6f 72 |default-|director|
|00003070| 79 20 6e 69 6c 20 66 20 | 64 69 72 2d 41 20 65 64 |y nil f |dir-A ed|
|00003080| 69 66 66 2d 72 65 61 64 | 2d 66 69 6c 65 2d 6e 61 |iff-read|-file-na|
|00003090| 6d 65 20 22 44 69 72 65 | 63 74 6f 72 79 20 41 20 |me "Dire|ctory A |
|000030a0| 74 6f 20 6d 65 72 67 65 | 22 20 22 44 69 72 65 63 |to merge|" "Direc|
|000030b0| 74 6f 72 79 20 42 20 74 | 6f 20 6d 65 72 67 65 22 |tory B t|o merge"|
|000030c0| 20 65 64 69 66 66 2d 6c | 61 73 74 2d 64 69 72 2d | ediff-l|ast-dir-|
|000030d0| 42 20 65 64 69 66 66 2d | 73 74 72 69 70 2d 6c 61 |B ediff-|strip-la|
|000030e0| 73 74 2d 64 69 72 20 22 | 41 6e 63 65 73 74 6f 72 |st-dir "|Ancestor|
|000030f0| 20 64 69 72 65 63 74 6f | 72 79 3a 20 22 20 65 64 | directo|ry: " ed|
|00003100| 69 66 66 2d 6c 61 73 74 | 2d 64 69 72 2d 43 20 72 |iff-last|-dir-C r|
|00003110| 65 61 64 2d 73 74 72 69 | 6e 67 20 22 46 69 6c 74 |ead-stri|ng "Filt|
|00003120| 65 72 20 74 68 72 6f 75 | 67 68 20 72 65 67 75 6c |er throu|gh regul|
|00003130| 61 72 20 65 78 70 72 65 | 73 73 69 6f 6e 3a 20 22 |ar expre|ssion: "|
|00003140| 20 65 64 69 66 66 2d 66 | 69 6c 74 65 72 69 6e 67 | ediff-f|iltering|
|00003150| 2d 72 65 67 65 78 70 2d | 68 69 73 74 6f 72 79 5d |-regexp-|history]|
|00003160| 20 37 29 5d 29 0a 28 66 | 73 65 74 20 27 65 64 69 | 7)]).(f|set 'edi|
|00003170| 66 66 2d 6d 65 72 67 65 | 2d 64 69 72 65 63 74 6f |ff-merge|-directo|
|00003180| 72 79 2d 72 65 76 69 73 | 69 6f 6e 73 20 23 5b 28 |ry-revis|ions #[(|
|00003190| 64 69 72 31 20 72 65 67 | 65 78 70 29 20 22 c0 09 |dir1 reg|exp) "..|
|000031a0| 5c 6e c3 c4 24 87 22 20 | 5b 65 64 69 66 66 2d 64 |\n..$." |[ediff-d|
|000031b0| 69 72 65 63 74 6f 72 79 | 2d 72 65 76 69 73 69 6f |irectory|-revisio|
|000031c0| 6e 73 2d 69 6e 74 65 72 | 6e 61 6c 20 64 69 72 31 |ns-inter|nal dir1|
|000031d0| 20 72 65 67 65 78 70 20 | 65 64 69 66 66 2d 6d 65 | regexp |ediff-me|
|000031e0| 72 67 65 2d 72 65 76 69 | 73 69 6f 6e 73 20 65 64 |rge-revi|sions ed|
|000031f0| 69 66 66 2d 6d 65 72 67 | 65 2d 64 69 72 65 63 74 |iff-merg|e-direct|
|00003200| 6f 72 79 2d 72 65 76 69 | 73 69 6f 6e 73 5d 20 35 |ory-revi|sions] 5|
|00003210| 20 22 5c 0a 52 75 6e 20 | 45 64 69 66 66 20 6f 6e | "\.Run |Ediff on|
|00003220| 20 61 20 64 69 72 65 63 | 74 6f 72 79 2c 20 44 49 | a direc|tory, DI|
|00003230| 52 31 2c 20 6d 65 72 67 | 69 6e 67 20 69 74 73 20 |R1, merg|ing its |
|00003240| 66 69 6c 65 73 20 77 69 | 74 68 20 74 68 65 69 72 |files wi|th their|
|00003250| 20 72 65 76 69 73 69 6f | 6e 73 2e 0a 54 68 65 20 | revisio|ns..The |
|00003260| 73 65 63 6f 6e 64 20 61 | 72 67 75 6d 65 6e 74 2c |second a|rgument,|
|00003270| 20 52 45 47 45 58 50 2c | 20 69 73 20 61 20 72 65 | REGEXP,| is a re|
|00003280| 67 75 6c 61 72 20 65 78 | 70 72 65 73 73 69 6f 6e |gular ex|pression|
|00003290| 20 74 68 61 74 20 66 69 | 6c 74 65 72 73 20 74 68 | that fi|lters th|
|000032a0| 65 20 66 69 6c 65 0a 6e | 61 6d 65 73 2e 20 4f 6e |e file.n|ames. On|
|000032b0| 6c 79 20 74 68 65 20 66 | 69 6c 65 73 20 74 68 61 |ly the f|iles tha|
|000032c0| 74 20 61 72 65 20 75 6e | 64 65 72 20 72 65 76 69 |t are un|der revi|
|000032d0| 73 69 6f 6e 20 63 6f 6e | 74 72 6f 6c 20 61 72 65 |sion con|trol are|
|000032e0| 20 74 61 6b 65 6e 20 69 | 6e 74 6f 20 61 63 63 6f | taken i|nto acco|
|000032f0| 75 6e 74 2e 22 20 28 62 | 79 74 65 2d 63 6f 64 65 |unt." (b|yte-code|
|00003300| 20 22 08 ab 83 09 aa 81 | 5c 6e 1b c4 c5 0b c6 23 | "......|\n.....#|
|00003310| c7 c8 c6 0e 09 23 29 44 | 87 22 20 5b 65 64 69 66 |.....#)D|." [edif|
|00003320| 66 2d 75 73 65 2d 6c 61 | 73 74 2d 64 69 72 20 65 |f-use-la|st-dir e|
|00003330| 64 69 66 66 2d 6c 61 73 | 74 2d 64 69 72 2d 41 20 |diff-las|t-dir-A |
|00003340| 64 65 66 61 75 6c 74 2d | 64 69 72 65 63 74 6f 72 |default-|director|
|00003350| 79 20 64 69 72 2d 41 20 | 65 64 69 66 66 2d 72 65 |y dir-A |ediff-re|
|00003360| 61 64 2d 66 69 6c 65 2d | 6e 61 6d 65 20 22 44 69 |ad-file-|name "Di|
|00003370| 72 65 63 74 6f 72 79 20 | 74 6f 20 6d 65 72 67 65 |rectory |to merge|
|00003380| 20 77 69 74 68 20 72 65 | 76 69 73 69 6f 6e 73 22 | with re|visions"|
|00003390| 20 6e 69 6c 20 72 65 61 | 64 2d 73 74 72 69 6e 67 | nil rea|d-string|
|000033a0| 20 22 46 69 6c 74 65 72 | 20 74 68 72 6f 75 67 68 | "Filter| through|
|000033b0| 20 72 65 67 75 6c 61 72 | 20 65 78 70 72 65 73 73 | regular| express|
|000033c0| 69 6f 6e 3a 20 22 20 65 | 64 69 66 66 2d 66 69 6c |ion: " e|diff-fil|
|000033d0| 74 65 72 69 6e 67 2d 72 | 65 67 65 78 70 2d 68 69 |tering-r|egexp-hi|
|000033e0| 73 74 6f 72 79 5d 20 35 | 29 5d 29 0a 28 64 65 66 |story] 5|)]).(def|
|000033f0| 61 6c 69 61 73 20 27 65 | 64 69 72 2d 6d 65 72 67 |alias 'e|dir-merg|
|00003400| 65 2d 72 65 76 69 73 69 | 6f 6e 73 20 27 65 64 69 |e-revisi|ons 'edi|
|00003410| 66 66 2d 6d 65 72 67 65 | 2d 64 69 72 65 63 74 6f |ff-merge|-directo|
|00003420| 72 79 2d 72 65 76 69 73 | 69 6f 6e 73 29 0a 28 66 |ry-revis|ions).(f|
|00003430| 73 65 74 20 27 65 64 69 | 66 66 2d 6d 65 72 67 65 |set 'edi|ff-merge|
|00003440| 2d 64 69 72 65 63 74 6f | 72 79 2d 72 65 76 69 73 |-directo|ry-revis|
|00003450| 69 6f 6e 73 2d 77 69 74 | 68 2d 61 6e 63 65 73 74 |ions-wit|h-ancest|
|00003460| 6f 72 20 23 5b 28 64 69 | 72 31 20 72 65 67 65 78 |or #[(di|r1 regex|
|00003470| 70 29 20 22 c0 09 5c 6e | c3 c4 24 87 22 20 5b 65 |p) "..\n|..$." [e|
|00003480| 64 69 66 66 2d 64 69 72 | 65 63 74 6f 72 79 2d 72 |diff-dir|ectory-r|
|00003490| 65 76 69 73 69 6f 6e 73 | 2d 69 6e 74 65 72 6e 61 |evisions|-interna|
|000034a0| 6c 20 64 69 72 31 20 72 | 65 67 65 78 70 20 65 64 |l dir1 r|egexp ed|
|000034b0| 69 66 66 2d 6d 65 72 67 | 65 2d 72 65 76 69 73 69 |iff-merg|e-revisi|
|000034c0| 6f 6e 73 2d 77 69 74 68 | 2d 61 6e 63 65 73 74 6f |ons-with|-ancesto|
|000034d0| 72 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 64 69 |r ediff-|merge-di|
|000034e0| 72 65 63 74 6f 72 79 2d | 72 65 76 69 73 69 6f 6e |rectory-|revision|
|000034f0| 73 2d 77 69 74 68 2d 61 | 6e 63 65 73 74 6f 72 5d |s-with-a|ncestor]|
|00003500| 20 35 20 22 5c 0a 52 75 | 6e 20 45 64 69 66 66 20 | 5 "\.Ru|n Ediff |
|00003510| 6f 6e 20 61 20 64 69 72 | 65 63 74 6f 72 79 2c 20 |on a dir|ectory, |
|00003520| 44 49 52 31 2c 20 6d 65 | 72 67 69 6e 67 20 69 74 |DIR1, me|rging it|
|00003530| 73 20 66 69 6c 65 73 20 | 77 69 74 68 20 74 68 65 |s files |with the|
|00003540| 69 72 20 72 65 76 69 73 | 69 6f 6e 73 20 61 6e 64 |ir revis|ions and|
|00003550| 20 61 6e 63 65 73 74 6f | 72 73 2e 0a 54 68 65 20 | ancesto|rs..The |
|00003560| 73 65 63 6f 6e 64 20 61 | 72 67 75 6d 65 6e 74 2c |second a|rgument,|
|00003570| 20 52 45 47 45 58 50 2c | 20 69 73 20 61 20 72 65 | REGEXP,| is a re|
|00003580| 67 75 6c 61 72 20 65 78 | 70 72 65 73 73 69 6f 6e |gular ex|pression|
|00003590| 20 74 68 61 74 20 66 69 | 6c 74 65 72 73 20 74 68 | that fi|lters th|
|000035a0| 65 20 66 69 6c 65 0a 6e | 61 6d 65 73 2e 20 4f 6e |e file.n|ames. On|
|000035b0| 6c 79 20 74 68 65 20 66 | 69 6c 65 73 20 74 68 61 |ly the f|iles tha|
|000035c0| 74 20 61 72 65 20 75 6e | 64 65 72 20 72 65 76 69 |t are un|der revi|
|000035d0| 73 69 6f 6e 20 63 6f 6e | 74 72 6f 6c 20 61 72 65 |sion con|trol are|
|000035e0| 20 74 61 6b 65 6e 20 69 | 6e 74 6f 20 61 63 63 6f | taken i|nto acco|
|000035f0| 75 6e 74 2e 22 20 28 62 | 79 74 65 2d 63 6f 64 65 |unt." (b|yte-code|
|00003600| 20 22 08 ab 83 09 aa 81 | 5c 6e 1b c4 c5 0b c6 23 | "......|\n.....#|
|00003610| c7 c8 c6 0e 09 23 29 44 | 87 22 20 5b 65 64 69 66 |.....#)D|." [edif|
|00003620| 66 2d 75 73 65 2d 6c 61 | 73 74 2d 64 69 72 20 65 |f-use-la|st-dir e|
|00003630| 64 69 66 66 2d 6c 61 73 | 74 2d 64 69 72 2d 41 20 |diff-las|t-dir-A |
|00003640| 64 65 66 61 75 6c 74 2d | 64 69 72 65 63 74 6f 72 |default-|director|
|00003650| 79 20 64 69 72 2d 41 20 | 65 64 69 66 66 2d 72 65 |y dir-A |ediff-re|
|00003660| 61 64 2d 66 69 6c 65 2d | 6e 61 6d 65 20 22 44 69 |ad-file-|name "Di|
|00003670| 72 65 63 74 6f 72 79 20 | 74 6f 20 6d 65 72 67 65 |rectory |to merge|
|00003680| 20 77 69 74 68 20 72 65 | 76 69 73 69 6f 6e 73 20 | with re|visions |
|00003690| 61 6e 64 20 61 6e 63 65 | 73 74 6f 72 73 22 20 6e |and ance|stors" n|
|000036a0| 69 6c 20 72 65 61 64 2d | 73 74 72 69 6e 67 20 22 |il read-|string "|
|000036b0| 46 69 6c 74 65 72 20 74 | 68 72 6f 75 67 68 20 72 |Filter t|hrough r|
|000036c0| 65 67 75 6c 61 72 20 65 | 78 70 72 65 73 73 69 6f |egular e|xpressio|
|000036d0| 6e 3a 20 22 20 65 64 69 | 66 66 2d 66 69 6c 74 65 |n: " edi|ff-filte|
|000036e0| 72 69 6e 67 2d 72 65 67 | 65 78 70 2d 68 69 73 74 |ring-reg|exp-hist|
|000036f0| 6f 72 79 5d 20 35 29 5d | 29 0a 28 62 79 74 65 2d |ory] 5)]|).(byte-|
|00003700| 63 6f 64 65 20 22 c0 c1 | c2 5c 22 88 c0 c3 c4 5c |code "..|.\"....\|
|00003710| 22 88 c5 c6 4d 88 c7 c8 | 4d 87 22 20 5b 64 65 66 |"...M...|M." [def|
|00003720| 61 6c 69 61 73 20 65 64 | 69 72 2d 6d 65 72 67 65 |alias ed|ir-merge|
|00003730| 2d 72 65 76 69 73 69 6f | 6e 73 2d 77 69 74 68 2d |-revisio|ns-with-|
|00003740| 61 6e 63 65 73 74 6f 72 | 20 65 64 69 66 66 2d 6d |ancestor| ediff-m|
|00003750| 65 72 67 65 2d 64 69 72 | 65 63 74 6f 72 79 2d 72 |erge-dir|ectory-r|
|00003760| 65 76 69 73 69 6f 6e 73 | 2d 77 69 74 68 2d 61 6e |evisions|-with-an|
|00003770| 63 65 73 74 6f 72 20 65 | 64 69 72 73 2d 6d 65 72 |cestor e|dirs-mer|
|00003780| 67 65 2d 77 69 74 68 2d | 61 6e 63 65 73 74 6f 72 |ge-with-|ancestor|
|00003790| 20 65 64 69 66 66 2d 6d | 65 72 67 65 2d 64 69 72 | ediff-m|erge-dir|
|000037a0| 65 63 74 6f 72 69 65 73 | 2d 77 69 74 68 2d 61 6e |ectories|-with-an|
|000037b0| 63 65 73 74 6f 72 20 65 | 64 69 66 66 2d 64 69 72 |cestor e|diff-dir|
|000037c0| 65 63 74 6f 72 69 65 73 | 2d 69 6e 74 65 72 6e 61 |ectories|-interna|
|000037d0| 6c 20 23 5b 28 64 69 72 | 31 20 64 69 72 32 20 64 |l #[(dir|1 dir2 d|
|000037e0| 69 72 33 20 72 65 67 65 | 78 70 20 61 63 74 69 6f |ir3 rege|xp actio|
|000037f0| 6e 20 6a 6f 62 6e 61 6d | 65 20 26 6f 70 74 69 6f |n jobnam|e &optio|
|00003800| 6e 61 6c 20 73 74 61 72 | 74 75 70 2d 68 6f 6f 6b |nal star|tup-hook|
|00003810| 73 29 20 22 c0 09 21 ab | 83 09 aa 83 c2 09 21 11 |s) "..!.|......!.|
|00003820| c0 0b 21 ab 83 0b aa 83 | c2 0b 21 13 0c 3b ab 8c |..!.....|..!..;..|
|00003830| c0 0c 21 ab 83 0c aa 83 | c2 0c 21 14 09 0b 98 ab |..!.....|..!.....|
|00003840| 87 c5 c6 09 5c 22 88 aa | a2 0e 07 c8 3d ab 8c 09 |....\"..|....=...|
|00003850| 0c 98 ab 87 c5 c9 09 5c | 22 88 aa 90 0e 07 c8 3d |.......\|"......=|
|00003860| ab 8a 0b 0c 98 ab 85 c5 | ca 09 5c 22 88 cb 89 89 |........|..\"....|
|00003870| 1e 0c 1e 0d 1e 0e cf 0e | 07 ce 0e 10 09 0b 0c 26 |........|.......&|
|00003880| 06 16 0d d1 cb d2 d3 d4 | 0e 15 44 45 d2 d6 d4 0e |........|..DE....|
|00003890| 0e 44 45 46 0e 17 42 16 | 17 d8 d9 0e 0d da db 0e |.DEF..B.|........|
|000038a0| 07 0e 17 26 06 16 0c dc | 0e 0c 21 2b 87 22 20 5b |...&....|..!+." [|
|000038b0| 66 69 6c 65 2d 64 69 72 | 65 63 74 6f 72 79 2d 70 |file-dir|ectory-p|
|000038c0| 20 64 69 72 31 20 66 69 | 6c 65 2d 6e 61 6d 65 2d | dir1 fi|le-name-|
|000038d0| 64 69 72 65 63 74 6f 72 | 79 20 64 69 72 32 20 64 |director|y dir2 d|
|000038e0| 69 72 33 20 65 72 72 6f | 72 20 22 44 69 72 65 63 |ir3 erro|r "Direc|
|000038f0| 74 6f 72 69 65 73 20 41 | 20 61 6e 64 20 42 20 61 |tories A| and B a|
|00003900| 72 65 20 74 68 65 20 73 | 61 6d 65 3a 20 25 73 22 |re the s|ame: %s"|
|00003910| 20 6a 6f 62 6e 61 6d 65 | 20 65 64 69 66 66 2d 64 | jobname| ediff-d|
|00003920| 69 72 65 63 74 6f 72 69 | 65 73 33 20 22 44 69 72 |irectori|es3 "Dir|
|00003930| 65 63 74 6f 72 69 65 73 | 20 41 20 61 6e 64 20 43 |ectories| A and C|
|00003940| 20 61 72 65 20 74 68 65 | 20 73 61 6d 65 3a 20 25 | are the| same: %|
|00003950| 73 22 20 22 44 69 72 65 | 63 74 6f 72 69 65 73 20 |s" "Dire|ctories |
|00003960| 42 20 61 6e 64 20 43 20 | 61 72 65 20 74 68 65 20 |B and C |are the |
|00003970| 73 61 6d 65 3a 20 25 73 | 22 20 6e 69 6c 20 6d 65 |same: %s|" nil me|
|00003980| 74 61 2d 62 75 66 20 66 | 69 6c 65 2d 6c 69 73 74 |ta-buf f|ile-list|
|00003990| 20 64 69 66 66 73 20 65 | 64 69 66 66 2d 69 6e 74 | diffs e|diff-int|
|000039a0| 65 72 73 65 63 74 2d 64 | 69 72 65 63 74 6f 72 69 |ersect-d|irectori|
|000039b0| 65 73 20 72 65 67 65 78 | 70 20 6c 61 6d 62 64 61 |es regex|p lambda|
|000039c0| 20 73 65 74 71 20 65 64 | 69 66 66 2d 73 65 73 73 | setq ed|iff-sess|
|000039d0| 69 6f 6e 2d 61 63 74 69 | 6f 6e 2d 66 75 6e 63 74 |ion-acti|on-funct|
|000039e0| 69 6f 6e 20 71 75 6f 74 | 65 20 61 63 74 69 6f 6e |ion quot|e action|
|000039f0| 20 65 64 69 66 66 2d 64 | 69 72 2d 64 69 66 66 65 | ediff-d|ir-diffe|
|00003a00| 72 65 6e 63 65 2d 6c 69 | 73 74 20 73 74 61 72 74 |rence-li|st start|
|00003a10| 75 70 2d 68 6f 6f 6b 73 | 20 65 64 69 66 66 2d 70 |up-hooks| ediff-p|
|00003a20| 72 65 70 61 72 65 2d 6d | 65 74 61 2d 62 75 66 66 |repare-m|eta-buff|
|00003a30| 65 72 20 65 64 69 66 66 | 2d 64 69 72 2d 61 63 74 |er ediff|-dir-act|
|00003a40| 69 6f 6e 20 22 2a 45 64 | 69 66 66 20 53 65 73 73 |ion "*Ed|iff Sess|
|00003a50| 69 6f 6e 20 47 72 6f 75 | 70 20 50 61 6e 65 6c 22 |ion Grou|p Panel"|
|00003a60| 20 65 64 69 66 66 2d 72 | 65 64 72 61 77 2d 64 69 | ediff-r|edraw-di|
|00003a70| 72 65 63 74 6f 72 79 2d | 67 72 6f 75 70 2d 62 75 |rectory-|group-bu|
|00003a80| 66 66 65 72 20 65 64 69 | 66 66 2d 73 68 6f 77 2d |ffer edi|ff-show-|
|00003a90| 6d 65 74 61 2d 62 75 66 | 66 65 72 5d 20 37 5d 20 |meta-buf|fer] 7] |
|00003aa0| 65 64 69 66 66 2d 64 69 | 72 65 63 74 6f 72 79 2d |ediff-di|rectory-|
|00003ab0| 72 65 76 69 73 69 6f 6e | 73 2d 69 6e 74 65 72 6e |revision|s-intern|
|00003ac0| 61 6c 20 23 5b 28 64 69 | 72 31 20 72 65 67 65 78 |al #[(di|r1 regex|
|00003ad0| 70 20 61 63 74 69 6f 6e | 20 6a 6f 62 6e 61 6d 65 |p action| jobname|
|00003ae0| 20 26 6f 70 74 69 6f 6e | 61 6c 20 73 74 61 72 74 | &option|al start|
|00003af0| 75 70 2d 68 6f 6f 6b 73 | 29 20 22 c0 09 21 ab 83 |up-hooks|) "..!..|
|00003b00| 09 aa 83 c2 09 21 11 c3 | 89 1c 1d c6 0e 07 0e 08 |.....!..|........|
|00003b10| 09 23 15 c9 c3 ca cb cc | 0e 0d 44 45 45 0e 0e 42 |.#......|..DEE..B|
|00003b20| 16 0e cf d0 0d d1 d2 0e | 07 0e 0e 26 06 14 d3 0c |........|...&....|
|00003b30| 21 2a 87 22 20 5b 66 69 | 6c 65 2d 64 69 72 65 63 |!*." [fi|le-direc|
|00003b40| 74 6f 72 79 2d 70 20 64 | 69 72 31 20 66 69 6c 65 |tory-p d|ir1 file|
|00003b50| 2d 6e 61 6d 65 2d 64 69 | 72 65 63 74 6f 72 79 20 |-name-di|rectory |
|00003b60| 6e 69 6c 20 6d 65 74 61 | 2d 62 75 66 20 66 69 6c |nil meta|-buf fil|
|00003b70| 65 2d 6c 69 73 74 20 65 | 64 69 66 66 2d 67 65 74 |e-list e|diff-get|
|00003b80| 2d 64 69 72 65 63 74 6f | 72 79 2d 66 69 6c 65 73 |-directo|ry-files|
|00003b90| 2d 75 6e 64 65 72 2d 72 | 65 76 69 73 69 6f 6e 20 |-under-r|evision |
|00003ba0| 6a 6f 62 6e 61 6d 65 20 | 72 65 67 65 78 70 20 6c |jobname |regexp l|
|00003bb0| 61 6d 62 64 61 20 73 65 | 74 71 20 65 64 69 66 66 |ambda se|tq ediff|
|00003bc0| 2d 73 65 73 73 69 6f 6e | 2d 61 63 74 69 6f 6e 2d |-session|-action-|
|00003bd0| 66 75 6e 63 74 69 6f 6e | 20 71 75 6f 74 65 20 61 |function| quote a|
|00003be0| 63 74 69 6f 6e 20 73 74 | 61 72 74 75 70 2d 68 6f |ction st|artup-ho|
|00003bf0| 6f 6b 73 20 65 64 69 66 | 66 2d 70 72 65 70 61 72 |oks edif|f-prepar|
|00003c00| 65 2d 6d 65 74 61 2d 62 | 75 66 66 65 72 20 65 64 |e-meta-b|uffer ed|
|00003c10| 69 66 66 2d 64 69 72 2d | 61 63 74 69 6f 6e 20 22 |iff-dir-|action "|
|00003c20| 2a 45 64 69 66 66 20 53 | 65 73 73 69 6f 6e 20 47 |*Ediff S|ession G|
|00003c30| 72 6f 75 70 20 50 61 6e | 65 6c 22 20 65 64 69 66 |roup Pan|el" edif|
|00003c40| 66 2d 72 65 64 72 61 77 | 2d 64 69 72 65 63 74 6f |f-redraw|-directo|
|00003c50| 72 79 2d 67 72 6f 75 70 | 2d 62 75 66 66 65 72 20 |ry-group|-buffer |
|00003c60| 65 64 69 66 66 2d 73 68 | 6f 77 2d 6d 65 74 61 2d |ediff-sh|ow-meta-|
|00003c70| 62 75 66 66 65 72 5d 20 | 37 5d 5d 20 33 29 0a 28 |buffer] |7]] 3).(|
|00003c80| 66 73 65 74 20 27 65 64 | 69 66 66 2d 77 69 6e 64 |fset 'ed|iff-wind|
|00003c90| 6f 77 73 2d 77 6f 72 64 | 77 69 73 65 20 23 5b 28 |ows-word|wise #[(|
|00003ca0| 64 75 6d 62 2d 6d 6f 64 | 65 20 26 6f 70 74 69 6f |dumb-mod|e &optio|
|00003cb0| 6e 61 6c 20 77 69 6e 64 | 2d 41 20 77 69 6e 64 2d |nal wind|-A wind-|
|00003cc0| 42 20 73 74 61 72 74 75 | 70 2d 68 6f 6f 6b 73 29 |B startu|p-hooks)|
|00003cd0| 20 22 c0 09 5c 6e 0b 0c | c5 c6 26 06 87 22 20 5b | "..\n..|..&.." [|
|00003ce0| 65 64 69 66 66 2d 77 69 | 6e 64 6f 77 73 20 64 75 |ediff-wi|ndows du|
|00003cf0| 6d 62 2d 6d 6f 64 65 20 | 77 69 6e 64 2d 41 20 77 |mb-mode |wind-A w|
|00003d00| 69 6e 64 2d 42 20 73 74 | 61 72 74 75 70 2d 68 6f |ind-B st|artup-ho|
|00003d10| 6f 6b 73 20 65 64 69 66 | 66 2d 77 69 6e 64 6f 77 |oks edif|f-window|
|00003d20| 73 2d 77 6f 72 64 77 69 | 73 65 20 77 6f 72 64 2d |s-wordwi|se word-|
|00003d30| 6d 6f 64 65 5d 20 37 20 | 22 5c 0a 43 6f 6d 70 61 |mode] 7 |"\.Compa|
|00003d40| 72 65 20 57 49 4e 44 2d | 41 20 61 6e 64 20 57 49 |re WIND-|A and WI|
|00003d50| 4e 44 2d 42 2c 20 77 68 | 69 63 68 20 61 72 65 20 |ND-B, wh|ich are |
|00003d60| 73 65 6c 65 63 74 65 64 | 20 62 79 20 63 6c 69 63 |selected| by clic|
|00003d70| 6b 69 6e 67 2c 20 77 6f | 72 64 77 69 73 65 2e 0a |king, wo|rdwise..|
|00003d80| 57 69 74 68 20 70 72 65 | 66 69 78 20 61 72 67 75 |With pre|fix argu|
|00003d90| 6d 65 6e 74 2c 20 44 55 | 4d 42 2d 4d 4f 44 45 2c |ment, DU|MB-MODE,|
|00003da0| 20 6f 72 20 6f 6e 20 61 | 20 6e 6f 6e 2d 77 69 6e | or on a| non-win|
|00003db0| 64 6f 77 69 6e 67 20 64 | 69 73 70 6c 61 79 2c 20 |dowing d|isplay, |
|00003dc0| 77 6f 72 6b 73 20 61 73 | 0a 66 6f 6c 6c 6f 77 73 |works as|.follows|
|00003dd0| 3a 0a 49 66 20 57 49 4e | 44 2d 41 20 69 73 20 6e |:.If WIN|D-A is n|
|00003de0| 69 6c 2c 20 75 73 65 20 | 73 65 6c 65 63 74 65 64 |il, use |selected|
|00003df0| 20 77 69 6e 64 6f 77 2e | 0a 49 66 20 57 49 4e 44 | window.|.If WIND|
|00003e00| 2d 42 20 69 73 20 6e 69 | 6c 2c 20 75 73 65 20 77 |-B is ni|l, use w|
|00003e10| 69 6e 64 6f 77 20 6e 65 | 78 74 20 74 6f 20 57 49 |indow ne|xt to WI|
|00003e20| 4e 44 2d 41 2e 22 20 22 | 50 22 5d 29 0a 28 66 73 |ND-A." "|P"]).(fs|
|00003e30| 65 74 20 27 65 64 69 66 | 66 2d 77 69 6e 64 6f 77 |et 'edif|f-window|
|00003e40| 73 2d 6c 69 6e 65 77 69 | 73 65 20 23 5b 28 64 75 |s-linewi|se #[(du|
|00003e50| 6d 62 2d 6d 6f 64 65 20 | 26 6f 70 74 69 6f 6e 61 |mb-mode |&optiona|
|00003e60| 6c 20 77 69 6e 64 2d 41 | 20 77 69 6e 64 2d 42 20 |l wind-A| wind-B |
|00003e70| 73 74 61 72 74 75 70 2d | 68 6f 6f 6b 73 29 20 22 |startup-|hooks) "|
|00003e80| c0 09 5c 6e 0b 0c c5 c6 | 26 06 87 22 20 5b 65 64 |..\n....|&.." [ed|
|00003e90| 69 66 66 2d 77 69 6e 64 | 6f 77 73 20 64 75 6d 62 |iff-wind|ows dumb|
|00003ea0| 2d 6d 6f 64 65 20 77 69 | 6e 64 2d 41 20 77 69 6e |-mode wi|nd-A win|
|00003eb0| 64 2d 42 20 73 74 61 72 | 74 75 70 2d 68 6f 6f 6b |d-B star|tup-hook|
|00003ec0| 73 20 65 64 69 66 66 2d | 77 69 6e 64 6f 77 73 2d |s ediff-|windows-|
|00003ed0| 6c 69 6e 65 77 69 73 65 | 20 6e 69 6c 5d 20 37 20 |linewise| nil] 7 |
|00003ee0| 22 5c 0a 43 6f 6d 70 61 | 72 65 20 57 49 4e 44 2d |"\.Compa|re WIND-|
|00003ef0| 41 20 61 6e 64 20 57 49 | 4e 44 2d 42 2c 20 77 68 |A and WI|ND-B, wh|
|00003f00| 69 63 68 20 61 72 65 20 | 73 65 6c 65 63 74 65 64 |ich are |selected|
|00003f10| 20 62 79 20 63 6c 69 63 | 6b 69 6e 67 2c 20 6c 69 | by clic|king, li|
|00003f20| 6e 65 77 69 73 65 2e 0a | 57 69 74 68 20 70 72 65 |newise..|With pre|
|00003f30| 66 69 78 20 61 72 67 75 | 6d 65 6e 74 2c 20 44 55 |fix argu|ment, DU|
|00003f40| 4d 42 2d 4d 4f 44 45 2c | 20 6f 72 20 6f 6e 20 61 |MB-MODE,| or on a|
|00003f50| 20 6e 6f 6e 2d 77 69 6e | 64 6f 77 69 6e 67 20 64 | non-win|dowing d|
|00003f60| 69 73 70 6c 61 79 2c 20 | 77 6f 72 6b 73 20 61 73 |isplay, |works as|
|00003f70| 0a 66 6f 6c 6c 6f 77 73 | 3a 0a 49 66 20 57 49 4e |.follows|:.If WIN|
|00003f80| 44 2d 41 20 69 73 20 6e | 69 6c 2c 20 75 73 65 20 |D-A is n|il, use |
|00003f90| 73 65 6c 65 63 74 65 64 | 20 77 69 6e 64 6f 77 2e |selected| window.|
|00003fa0| 0a 49 66 20 57 49 4e 44 | 2d 42 20 69 73 20 6e 69 |.If WIND|-B is ni|
|00003fb0| 6c 2c 20 75 73 65 20 77 | 69 6e 64 6f 77 20 6e 65 |l, use w|indow ne|
|00003fc0| 78 74 20 74 6f 20 57 49 | 4e 44 2d 41 2e 22 20 22 |xt to WI|ND-A." "|
|00003fd0| 50 22 5d 29 0a 28 66 73 | 65 74 20 27 65 64 69 66 |P"]).(fs|et 'edif|
|00003fe0| 66 2d 77 69 6e 64 6f 77 | 73 20 23 5b 28 64 75 6d |f-window|s #[(dum|
|00003ff0| 62 2d 6d 6f 64 65 20 77 | 69 6e 64 2d 41 20 77 69 |b-mode w|ind-A wi|
|00004000| 6e 64 2d 42 20 73 74 61 | 72 74 75 70 2d 68 6f 6f |nd-B sta|rtup-hoo|
|00004010| 6b 73 20 6a 6f 62 2d 6e | 61 6d 65 20 77 6f 72 64 |ks job-n|ame word|
|00004020| 2d 6d 6f 64 65 29 20 22 | 08 ac 8a c1 20 ab 86 c1 |-mode) "|.... ...|
|00004030| 20 c2 3e ab ba 0b c4 1d | 1e 06 c7 0e 06 21 ae 8e | .>.....|.....!..|
|00004040| 0d ab 86 c8 0e 06 21 aa | 82 c9 20 89 16 06 2a 13 |......!.|.. ...*.|
|00004050| 0e 5c 6e 0b 1d 1e 06 c7 | 0e 06 21 ae 8e 0d ab 86 |.\n.....|..!.....|
|00004060| c8 0e 06 21 aa 82 c9 20 | 89 16 06 2a 16 5c 6e aa |...!... |...*.\n.|
|00004070| 8e cb 0b c4 cc 23 13 cb | 0e 5c 6e 0b cd 23 16 5c |.....#..|.\n..#.\|
|00004080| 6e ce 0b 21 ce 0e 5c 6e | 21 c4 89 89 89 1e 0f 1e |n..!..\n|!.......|
|00004090| 10 1e 11 1e 12 1e 13 1e | 14 8a d5 8b 88 29 d6 0e |........|.....)..|
|000040a0| 14 0e 12 0e 11 0e 13 0e | 10 0e 0f 0e 17 0e 18 0e |........|........|
|000040b0| 19 26 09 2e 06 87 22 20 | 5b 64 75 6d 62 2d 6d 6f |.&...." |[dumb-mo|
|000040c0| 64 65 20 65 64 69 66 66 | 2d 64 65 76 69 63 65 2d |de ediff|-device-|
|000040d0| 74 79 70 65 20 28 74 74 | 79 20 73 74 72 65 61 6d |type (tt|y stream|
|000040e0| 29 20 77 69 6e 64 2d 41 | 20 6e 69 6c 20 70 72 65 |) wind-A| nil pre|
|000040f0| 76 2d 77 69 6e 64 20 77 | 69 6e 64 20 77 69 6e 64 |v-wind w|ind wind|
|00004100| 6f 77 2d 6c 69 76 65 2d | 70 20 6e 65 78 74 2d 77 |ow-live-|p next-w|
|00004110| 69 6e 64 6f 77 20 73 65 | 6c 65 63 74 65 64 2d 77 |indow se|lected-w|
|00004120| 69 6e 64 6f 77 20 77 69 | 6e 64 2d 42 20 65 64 69 |indow wi|nd-B edi|
|00004130| 66 66 2d 67 65 74 2d 77 | 69 6e 64 6f 77 2d 62 79 |ff-get-w|indow-by|
|00004140| 2d 63 6c 69 63 6b 69 6e | 67 20 31 20 32 20 77 69 |-clickin|g 1 2 wi|
|00004150| 6e 64 6f 77 2d 62 75 66 | 66 65 72 20 65 6e 64 2d |ndow-buf|fer end-|
|00004160| 42 20 62 65 67 2d 42 20 | 65 6e 64 2d 41 20 62 65 |B beg-B |end-A be|
|00004170| 67 2d 41 20 62 75 66 66 | 65 72 2d 42 20 62 75 66 |g-A buff|er-B buf|
|00004180| 66 65 72 2d 41 20 28 28 | 62 79 74 65 2d 63 6f 64 |fer-A ((|byte-cod|
|00004190| 65 20 22 c0 c1 21 88 c2 | 0b 21 88 c4 20 15 c6 20 |e "..!..|.!.. .. |
|000041a0| 16 07 c2 0e 08 21 88 c4 | 20 16 09 c6 20 16 5c 6e |.....!..| ... .\n|
|000041b0| c0 87 22 20 5b 73 69 74 | 2d 66 6f 72 20 30 20 73 |.." [sit|-for 0 s|
|000041c0| 65 6c 65 63 74 2d 77 69 | 6e 64 6f 77 20 77 69 6e |elect-wi|ndow win|
|000041d0| 64 2d 41 20 77 69 6e 64 | 6f 77 2d 73 74 61 72 74 |d-A wind|ow-start|
|000041e0| 20 62 65 67 2d 41 20 77 | 69 6e 64 6f 77 2d 65 6e | beg-A w|indow-en|
|000041f0| 64 20 65 6e 64 2d 41 20 | 77 69 6e 64 2d 42 20 62 |d end-A |wind-B b|
|00004200| 65 67 2d 42 20 65 6e 64 | 2d 42 5d 20 32 29 29 20 |eg-B end|-B] 2)) |
|00004210| 65 64 69 66 66 2d 72 65 | 67 69 6f 6e 73 2d 69 6e |ediff-re|gions-in|
|00004220| 74 65 72 6e 61 6c 20 73 | 74 61 72 74 75 70 2d 68 |ternal s|tartup-h|
|00004230| 6f 6f 6b 73 20 6a 6f 62 | 2d 6e 61 6d 65 20 77 6f |ooks job|-name wo|
|00004240| 72 64 2d 6d 6f 64 65 5d | 20 31 30 5d 29 0a 28 66 |rd-mode]| 10]).(f|
|00004250| 73 65 74 20 27 65 64 69 | 66 66 2d 72 65 67 69 6f |set 'edi|ff-regio|
|00004260| 6e 73 2d 77 6f 72 64 77 | 69 73 65 20 23 5b 28 62 |ns-wordw|ise #[(b|
|00004270| 75 66 66 65 72 2d 41 20 | 62 75 66 66 65 72 2d 42 |uffer-A |buffer-B|
|00004280| 20 26 6f 70 74 69 6f 6e | 61 6c 20 73 74 61 72 74 | &option|al start|
|00004290| 75 70 2d 68 6f 6f 6b 73 | 29 20 22 08 ab 8c c1 08 |up-hooks|) ".....|
|000042a0| 21 ab 87 c2 c1 08 21 21 | ac 85 c3 c4 08 5c 22 88 |!.....!!|.....\".|
|000042b0| 0d ab 8c c1 0d 21 ab 87 | c2 c1 0d 21 21 ac 85 c3 |.....!..|...!!...|
|000042c0| c4 0d 5c 22 88 c6 89 89 | 89 1e 07 1e 08 1e 09 1e |..\"....|........|
|000042d0| 5c 6e 8a 08 71 88 cb 20 | 16 5c 6e cc 20 16 09 0d |\n..q.. |.\n. ...|
|000042e0| 71 88 cb 20 16 08 cc 20 | 16 07 29 cd c1 08 21 0e |q.. ... |..)...!.|
|000042f0| 5c 6e 0e 09 c1 0d 21 0e | 08 0e 07 0e 0e cf d0 26 |\n....!.|.......&|
|00004300| 09 2c 87 22 20 5b 62 75 | 66 66 65 72 2d 41 20 67 |.,." [bu|ffer-A g|
|00004310| 65 74 2d 62 75 66 66 65 | 72 20 62 75 66 66 65 72 |et-buffe|r buffer|
|00004320| 2d 6e 61 6d 65 20 65 72 | 72 6f 72 20 22 42 75 66 |-name er|ror "Buf|
|00004330| 66 65 72 20 25 53 20 64 | 6f 65 73 6e 27 74 20 65 |fer %S d|oesn't e|
|00004340| 78 69 73 74 22 20 62 75 | 66 66 65 72 2d 42 20 6e |xist" bu|ffer-B n|
|00004350| 69 6c 20 72 65 67 2d 42 | 2d 65 6e 64 20 72 65 67 |il reg-B|-end reg|
|00004360| 2d 42 2d 62 65 67 20 72 | 65 67 2d 41 2d 65 6e 64 |-B-beg r|eg-A-end|
|00004370| 20 72 65 67 2d 41 2d 62 | 65 67 20 72 65 67 69 6f | reg-A-b|eg regio|
|00004380| 6e 2d 62 65 67 69 6e 6e | 69 6e 67 20 72 65 67 69 |n-beginn|ing regi|
|00004390| 6f 6e 2d 65 6e 64 20 65 | 64 69 66 66 2d 72 65 67 |on-end e|diff-reg|
|000043a0| 69 6f 6e 73 2d 69 6e 74 | 65 72 6e 61 6c 20 73 74 |ions-int|ernal st|
|000043b0| 61 72 74 75 70 2d 68 6f | 6f 6b 73 20 65 64 69 66 |artup-ho|oks edif|
|000043c0| 66 2d 72 65 67 69 6f 6e | 73 2d 77 6f 72 64 77 69 |f-region|s-wordwi|
|000043d0| 73 65 20 77 6f 72 64 2d | 6d 6f 64 65 5d 20 31 30 |se word-|mode] 10|
|000043e0| 20 22 5c 0a 52 75 6e 20 | 45 64 69 66 66 20 6f 6e | "\.Run |Ediff on|
|000043f0| 20 61 20 70 61 69 72 20 | 6f 66 20 72 65 67 69 6f | a pair |of regio|
|00004400| 6e 73 20 69 6e 20 74 77 | 6f 20 64 69 66 66 65 72 |ns in tw|o differ|
|00004410| 65 6e 74 20 62 75 66 66 | 65 72 73 2e 0a 52 65 67 |ent buff|ers..Reg|
|00004420| 69 6f 6e 73 20 28 69 2e | 65 2e 2c 20 70 6f 69 6e |ions (i.|e., poin|
|00004430| 74 20 61 6e 64 20 6d 61 | 72 6b 29 20 61 72 65 20 |t and ma|rk) are |
|00004440| 61 73 73 75 6d 65 64 20 | 74 6f 20 62 65 20 73 65 |assumed |to be se|
|00004450| 74 20 69 6e 20 61 64 76 | 61 6e 63 65 2e 0a 54 68 |t in adv|ance..Th|
|00004460| 69 73 20 66 75 6e 63 74 | 69 6f 6e 20 69 73 20 65 |is funct|ion is e|
|00004470| 66 66 65 63 74 69 76 65 | 20 6f 6e 6c 79 20 66 6f |ffective| only fo|
|00004480| 72 20 72 65 6c 61 74 69 | 76 65 6c 79 20 73 6d 61 |r relati|vely sma|
|00004490| 6c 6c 20 72 65 67 69 6f | 6e 73 2c 20 75 70 20 74 |ll regio|ns, up t|
|000044a0| 6f 20 32 30 30 0a 6c 69 | 6e 65 73 2e 20 46 6f 72 |o 200.li|nes. For|
|000044b0| 20 6c 61 72 67 65 20 72 | 65 67 69 6f 6e 73 2c 20 | large r|egions, |
|000044c0| 75 73 65 20 60 65 64 69 | 66 66 2d 72 65 67 69 6f |use `edi|ff-regio|
|000044d0| 6e 73 2d 6c 69 6e 65 77 | 69 73 65 27 2e 22 20 28 |ns-linew|ise'." (|
|000044e0| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 19 c2 c3 c4 |byte-cod|e ".....|
|000044f0| c5 21 c6 23 89 11 c2 c7 | c8 8b 88 c4 09 21 c6 23 |.!.#....|.....!.#|
|00004500| 29 44 87 22 20 5b 6e 69 | 6c 20 62 66 20 72 65 61 |)D." [ni|l bf rea|
|00004510| 64 2d 62 75 66 66 65 72 | 20 22 52 65 67 69 6f 6e |d-buffer| "Region|
|00004520| 27 73 20 41 20 62 75 66 | 66 65 72 3a 20 22 20 65 |'s A buf|fer: " e|
|00004530| 64 69 66 66 2d 6f 74 68 | 65 72 2d 62 75 66 66 65 |diff-oth|er-buffe|
|00004540| 72 20 22 22 20 74 20 22 | 52 65 67 69 6f 6e 27 73 |r "" t "|Region's|
|00004550| 20 42 20 62 75 66 66 65 | 72 3a 20 22 20 28 28 6f | B buffe|r: " ((o|
|00004560| 74 68 65 72 2d 77 69 6e | 64 6f 77 20 31 29 29 5d |ther-win|dow 1))]|
|00004570| 20 35 29 5d 29 0a 28 66 | 73 65 74 20 27 65 64 69 | 5)]).(f|set 'edi|
|00004580| 66 66 2d 72 65 67 69 6f | 6e 73 2d 6c 69 6e 65 77 |ff-regio|ns-linew|
|00004590| 69 73 65 20 23 5b 28 62 | 75 66 66 65 72 2d 41 20 |ise #[(b|uffer-A |
|000045a0| 62 75 66 66 65 72 2d 42 | 20 26 6f 70 74 69 6f 6e |buffer-B| &option|
|000045b0| 61 6c 20 73 74 61 72 74 | 75 70 2d 68 6f 6f 6b 73 |al start|up-hooks|
|000045c0| 29 20 22 08 ab 8c c1 08 | 21 ab 87 c2 c1 08 21 21 |) ".....|!.....!!|
|000045d0| ac 85 c3 c4 08 5c 22 88 | 0d ab 8c c1 0d 21 ab 87 |.....\".|.....!..|
|000045e0| c2 c1 0d 21 21 ac 85 c3 | c4 0d 5c 22 88 c6 89 89 |...!!...|..\"....|
|000045f0| 89 1e 07 1e 08 1e 09 1e | 5c 6e 8a 08 71 88 cb 20 |........|\n..q.. |
|00004600| 16 5c 6e cc 20 16 09 0e | 5c 6e 62 88 cd 79 88 60 |.\n. ...|\nb..y.`|
|00004610| 16 5c 6e 0e 09 62 88 c6 | 7f 88 6d ac 83 c6 75 88 |.\n..b..|..m...u.|
|00004620| 60 16 09 0d 71 88 cb 20 | 16 08 cc 20 16 07 0e 5c |`...q.. |... ...\|
|00004630| 6e 62 88 0e 08 62 88 cd | 79 88 60 16 08 0e 07 62 |nb...b..|y.`....b|
|00004640| 88 c6 7f 88 6d ac 83 c6 | 75 88 60 16 07 29 ce c1 |....m...|u.`..)..|
|00004650| 08 21 0e 5c 6e 0e 09 c1 | 0d 21 0e 08 0e 07 0e 0f |.!.\n...|.!......|
|00004660| d0 c6 26 09 2c 87 22 20 | 5b 62 75 66 66 65 72 2d |..&.,." |[buffer-|
|00004670| 41 20 67 65 74 2d 62 75 | 66 66 65 72 20 62 75 66 |A get-bu|ffer buf|
|00004680| 66 65 72 2d 6e 61 6d 65 | 20 65 72 72 6f 72 20 22 |fer-name| error "|
|00004690| 42 75 66 66 65 72 20 25 | 53 20 64 6f 65 73 6e 27 |Buffer %|S doesn'|
|000046a0| 74 20 65 78 69 73 74 22 | 20 62 75 66 66 65 72 2d |t exist"| buffer-|
|000046b0| 42 20 6e 69 6c 20 72 65 | 67 2d 42 2d 65 6e 64 20 |B nil re|g-B-end |
|000046c0| 72 65 67 2d 42 2d 62 65 | 67 20 72 65 67 2d 41 2d |reg-B-be|g reg-A-|
|000046d0| 65 6e 64 20 72 65 67 2d | 41 2d 62 65 67 20 72 65 |end reg-|A-beg re|
|000046e0| 67 69 6f 6e 2d 62 65 67 | 69 6e 6e 69 6e 67 20 72 |gion-beg|inning r|
|000046f0| 65 67 69 6f 6e 2d 65 6e | 64 20 30 20 65 64 69 66 |egion-en|d 0 edif|
|00004700| 66 2d 72 65 67 69 6f 6e | 73 2d 69 6e 74 65 72 6e |f-region|s-intern|
|00004710| 61 6c 20 73 74 61 72 74 | 75 70 2d 68 6f 6f 6b 73 |al start|up-hooks|
|00004720| 20 65 64 69 66 66 2d 72 | 65 67 69 6f 6e 73 2d 6c | ediff-r|egions-l|
|00004730| 69 6e 65 77 69 73 65 5d | 20 31 30 20 22 5c 0a 52 |inewise]| 10 "\.R|
|00004740| 75 6e 20 45 64 69 66 66 | 20 6f 6e 20 61 20 70 61 |un Ediff| on a pa|
|00004750| 69 72 20 6f 66 20 72 65 | 67 69 6f 6e 73 20 69 6e |ir of re|gions in|
|00004760| 20 74 77 6f 20 64 69 66 | 66 65 72 65 6e 74 20 62 | two dif|ferent b|
|00004770| 75 66 66 65 72 73 2e 0a | 52 65 67 69 6f 6e 73 20 |uffers..|Regions |
|00004780| 28 69 2e 65 2e 2c 20 70 | 6f 69 6e 74 20 61 6e 64 |(i.e., p|oint and|
|00004790| 20 6d 61 72 6b 29 20 61 | 72 65 20 61 73 73 75 6d | mark) a|re assum|
|000047a0| 65 64 20 74 6f 20 62 65 | 20 73 65 74 20 69 6e 20 |ed to be| set in |
|000047b0| 61 64 76 61 6e 63 65 2e | 0a 45 61 63 68 20 72 65 |advance.|.Each re|
|000047c0| 67 69 6f 6e 20 69 73 20 | 65 6e 6c 61 72 67 65 64 |gion is |enlarged|
|000047d0| 20 74 6f 20 63 6f 6e 74 | 61 69 6e 20 66 75 6c 6c | to cont|ain full|
|000047e0| 20 6c 69 6e 65 73 2e 0a | 54 68 69 73 20 66 75 6e | lines..|This fun|
|000047f0| 63 74 69 6f 6e 20 69 73 | 20 65 66 66 65 63 74 69 |ction is| effecti|
|00004800| 76 65 20 66 6f 72 20 6c | 61 72 67 65 20 72 65 67 |ve for l|arge reg|
|00004810| 69 6f 6e 73 2c 20 6f 76 | 65 72 20 31 30 30 2d 32 |ions, ov|er 100-2|
|00004820| 30 30 0a 6c 69 6e 65 73 | 2e 20 46 6f 72 20 73 6d |00.lines|. For sm|
|00004830| 61 6c 6c 20 72 65 67 69 | 6f 6e 73 2c 20 75 73 65 |all regi|ons, use|
|00004840| 20 60 65 64 69 66 66 2d | 72 65 67 69 6f 6e 73 2d | `ediff-|regions-|
|00004850| 77 6f 72 64 77 69 73 65 | 27 2e 22 20 28 62 79 74 |wordwise|'." (byt|
|00004860| 65 2d 63 6f 64 65 20 22 | c0 19 c2 c3 c4 c5 21 c6 |e-code "|......!.|
|00004870| 23 89 11 c2 c7 c8 8b 88 | c4 09 21 c6 23 29 44 87 |#.......|..!.#)D.|
|00004880| 22 20 5b 6e 69 6c 20 62 | 66 20 72 65 61 64 2d 62 |" [nil b|f read-b|
|00004890| 75 66 66 65 72 20 22 52 | 65 67 69 6f 6e 20 41 27 |uffer "R|egion A'|
|000048a0| 73 20 62 75 66 66 65 72 | 3a 20 22 20 65 64 69 66 |s buffer|: " edif|
|000048b0| 66 2d 6f 74 68 65 72 2d | 62 75 66 66 65 72 20 22 |f-other-|buffer "|
|000048c0| 22 20 74 20 22 52 65 67 | 69 6f 6e 20 42 27 73 20 |" t "Reg|ion B's |
|000048d0| 62 75 66 66 65 72 3a 20 | 22 20 28 28 6f 74 68 65 |buffer: |" ((othe|
|000048e0| 72 2d 77 69 6e 64 6f 77 | 20 31 29 29 5d 20 35 29 |r-window| 1))] 5)|
|000048f0| 5d 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |]).(byte|-code ".|
|00004900| c1 4d 88 c2 c3 c4 5c 22 | 88 c5 c6 4d 88 c5 c7 4e |.M....\"|...M...N|
|00004910| c8 3e ac 85 c9 ca c5 5c | 22 88 cb c5 c7 cc 23 87 |.>.....\|".....#.|
|00004920| 22 20 5b 65 64 69 66 66 | 2d 72 65 67 69 6f 6e 73 |" [ediff|-regions|
|00004930| 2d 69 6e 74 65 72 6e 61 | 6c 20 23 5b 28 62 75 66 |-interna|l #[(buf|
|00004940| 66 65 72 2d 41 20 62 65 | 67 2d 41 20 65 6e 64 2d |fer-A be|g-A end-|
|00004950| 41 20 62 75 66 66 65 72 | 2d 42 20 62 65 67 2d 42 |A buffer|-B beg-B|
|00004960| 20 65 6e 64 2d 42 20 73 | 74 61 72 74 75 70 2d 68 | end-B s|tartup-h|
|00004970| 6f 6f 6b 73 20 6a 6f 62 | 2d 6e 61 6d 65 20 77 6f |ooks job|-name wo|
|00004980| 72 64 2d 6d 6f 64 65 29 | 20 22 c0 09 21 c2 89 89 |rd-mode)| "..!...|
|00004990| 89 1b 1c 1d 1e 06 1e 07 | 70 1e 08 0e 09 ab a7 ca |........|p.......|
|000049a0| 0e 09 21 ab a1 cb ca 0e | 09 21 21 ab 99 cc 8e 0e |..!.....|.!!.....|
|000049b0| 09 71 88 cd 20 0e 0e c2 | 93 16 0e cd 20 0e 0f c2 |.q.. ...|.... ...|
|000049c0| 93 16 0f 29 aa 8a 0e 10 | d1 3d ac 84 d2 d3 21 88 |...)....|.=....!.|
|000049d0| 29 70 1e 08 0e 14 ab a7 | ca 0e 14 21 ab a1 cb ca |)p......|...!....|
|000049e0| 0e 14 21 21 ab 99 d5 8e | 0e 14 71 88 cd 20 0e 16 |..!!....|..q.. ..|
|000049f0| c2 93 16 16 cd 20 0e 17 | c2 93 16 17 29 aa 8a 0e |..... ..|....)...|
|00004a00| 10 d1 3d ac 84 d2 d3 21 | 88 29 0e 09 0e 14 3d ab |..=....!|.)....=.|
|00004a10| af 0e 0e 0e 17 57 ab 87 | 0e 16 0e 0e 58 ac 8e 0e |.....W..|....X...|
|00004a20| 16 0e 0f 57 ab 9a 0e 0f | 0e 17 58 ab 93 0e 18 90 |...W....|..X.....|
|00004a30| d9 da 21 91 88 db dc 21 | ac 86 d2 dd 0e 1e 5c 22 |..!....!|......\"|
|00004a40| 88 0e 1f ab 8d e0 0e 0e | 0e 0f 0e 09 0e 07 24 88 |........|......$.|
|00004a50| aa 8b e1 0e 0e 0e 0f 0e | 09 0e 07 24 88 e2 0e 07 |........|...$....|
|00004a60| e3 5c 22 14 0e 1f ab 8d | e0 0e 16 0e 17 0e 14 0e |.\".....|........|
|00004a70| 07 24 88 aa 8b e1 0e 16 | 0e 17 0e 14 0e 07 24 88 |.$......|......$.|
|00004a80| e2 0e 07 e4 5c 22 13 e5 | 0e 0e 0e 0f 0e 09 23 16 |....\"..|......#.|
|00004a90| 06 e5 0e 16 0e 17 0e 14 | 23 15 e6 0e 09 0c 0e 14 |........|#.......|
|00004aa0| 0b c2 89 e7 c2 e8 0c 44 | e8 0b 44 46 0e 29 42 ea |.......D|..DF.)B.|
|00004ab0| 0e 1f 42 eb 0e 06 0d 44 | 42 ec 0e 1e 42 45 26 08 |..B....D|B...BE&.|
|00004ac0| 2d 87 22 20 5b 67 65 74 | 2d 62 75 66 66 65 72 2d |-." [get|-buffer-|
|00004ad0| 63 72 65 61 74 65 20 65 | 64 69 66 66 2d 74 6d 70 |create e|diff-tmp|
|00004ae0| 2d 62 75 66 66 65 72 20 | 6e 69 6c 20 66 69 6c 65 |-buffer |nil file|
|00004af0| 2d 42 20 66 69 6c 65 2d | 41 20 6f 76 65 72 6c 2d |-B file-|A overl-|
|00004b00| 42 20 6f 76 65 72 6c 2d | 41 20 74 6d 70 2d 62 75 |B overl-|A tmp-bu|
|00004b10| 66 66 65 72 20 53 74 61 | 72 74 42 75 66 66 65 72 |ffer Sta|rtBuffer|
|00004b20| 20 62 75 66 66 65 72 2d | 41 20 67 65 74 2d 62 75 | buffer-|A get-bu|
|00004b30| 66 66 65 72 20 62 75 66 | 66 65 72 2d 6e 61 6d 65 |ffer buf|fer-name|
|00004b40| 20 28 28 73 65 74 2d 62 | 75 66 66 65 72 20 53 74 | ((set-b|uffer St|
|00004b50| 61 72 74 42 75 66 66 65 | 72 29 29 20 6d 61 6b 65 |artBuffe|r)) make|
|00004b60| 2d 6d 61 72 6b 65 72 20 | 62 65 67 2d 41 20 65 6e |-marker |beg-A en|
|00004b70| 64 2d 41 20 74 68 69 73 | 2d 63 6f 6d 6d 61 6e 64 |d-A this|-command|
|00004b80| 20 65 64 69 66 66 2d 71 | 75 69 74 20 65 72 72 6f | ediff-q|uit erro|
|00004b90| 72 20 22 59 6f 75 27 76 | 65 20 6b 69 6c 6c 65 64 |r "You'v|e killed|
|00004ba0| 20 61 6e 20 65 73 73 65 | 6e 74 69 61 6c 20 45 64 | an esse|ntial Ed|
|00004bb0| 69 66 66 20 62 75 66 66 | 65 72 2d 2d 2d 50 6c 65 |iff buff|er---Ple|
|00004bc0| 61 73 65 20 71 75 69 74 | 20 45 64 69 66 66 22 20 |ase quit| Ediff" |
|00004bd0| 62 75 66 66 65 72 2d 42 | 20 28 28 73 65 74 2d 62 |buffer-B| ((set-b|
|00004be0| 75 66 66 65 72 20 53 74 | 61 72 74 42 75 66 66 65 |uffer St|artBuffe|
|00004bf0| 72 29 29 20 62 65 67 2d | 42 20 65 6e 64 2d 42 20 |r)) beg-|B end-B |
|00004c00| 65 64 69 66 66 2d 6d 73 | 67 2d 62 75 66 66 65 72 |ediff-ms|g-buffer|
|00004c10| 20 70 72 69 6e 63 20 22 | 5c 6e 59 6f 75 20 68 61 | princ "|\nYou ha|
|00004c20| 76 65 20 72 65 71 75 65 | 73 74 65 64 20 74 6f 20 |ve reque|sted to |
|00004c30| 63 6f 6d 70 61 72 65 20 | 6f 76 65 72 6c 61 70 70 |compare |overlapp|
|00004c40| 69 6e 67 20 72 65 67 69 | 6f 6e 73 20 6f 66 20 74 |ing regi|ons of t|
|00004c50| 68 65 20 73 61 6d 65 20 | 62 75 66 66 65 72 2e 5c |he same |buffer.\|
|00004c60| 6e 5c 6e 49 6e 20 74 68 | 69 73 20 63 61 73 65 2c |n\nIn th|is case,|
|00004c70| 20 45 64 69 66 66 27 73 | 20 68 69 67 68 6c 69 67 | Ediff's| highlig|
|00004c80| 68 74 69 6e 67 20 6d 61 | 79 20 62 65 20 63 6f 6e |hting ma|y be con|
|00004c90| 66 75 73 69 6e 67 2d 2d | 2d 69 6e 20 74 68 65 20 |fusing--|-in the |
|00004ca0| 73 61 6d 65 20 77 69 6e | 64 6f 77 2c 5c 6e 79 6f |same win|dow,\nyo|
|00004cb0| 75 20 6d 61 79 20 73 65 | 65 20 68 69 67 68 6c 69 |u may se|e highli|
|00004cc0| 67 68 74 65 64 20 72 65 | 67 69 6f 6e 73 20 74 68 |ghted re|gions th|
|00004cd0| 61 74 20 62 65 6c 6f 6e | 67 20 74 6f 20 64 69 66 |at belon|g to dif|
|00004ce0| 66 65 72 65 6e 74 20 72 | 65 67 69 6f 6e 73 2e 5c |ferent r|egions.\|
|00004cf0| 6e 5c 6e 43 6f 6e 74 69 | 6e 75 65 20 61 6e 79 77 |n\nConti|nue anyw|
|00004d00| 61 79 3f 20 28 79 2f 6e | 29 20 22 20 79 2d 6f 72 |ay? (y/n|) " y-or|
|00004d10| 2d 6e 2d 70 20 22 43 6f | 6e 74 69 6e 75 65 20 61 |-n-p "Co|ntinue a|
|00004d20| 6e 79 77 61 79 3f 20 22 | 20 22 25 53 20 61 62 6f |nyway? "| "%S abo|
|00004d30| 72 74 65 64 22 20 6a 6f | 62 2d 6e 61 6d 65 20 77 |rted" jo|b-name w|
|00004d40| 6f 72 64 2d 6d 6f 64 65 | 20 65 64 69 66 66 2d 77 |ord-mode| ediff-w|
|00004d50| 6f 72 64 69 66 79 20 65 | 64 69 66 66 2d 63 6f 70 |ordify e|diff-cop|
|00004d60| 79 2d 74 6f 2d 62 75 66 | 66 65 72 20 65 64 69 66 |y-to-buf|fer edif|
|00004d70| 66 2d 6d 61 6b 65 2d 74 | 65 6d 70 2d 66 69 6c 65 |f-make-t|emp-file|
|00004d80| 20 22 72 65 67 41 22 20 | 22 72 65 67 42 22 20 65 | "regA" |"regB" e|
|00004d90| 64 69 66 66 2d 6d 61 6b | 65 2d 62 75 6c 6c 65 74 |diff-mak|e-bullet|
|00004da0| 2d 70 72 6f 6f 66 2d 6f | 76 65 72 6c 61 79 20 65 |-proof-o|verlay e|
|00004db0| 64 69 66 66 2d 73 65 74 | 75 70 20 6c 61 6d 62 64 |diff-set|up lambd|
|00004dc0| 61 20 64 65 6c 65 74 65 | 2d 66 69 6c 65 20 73 74 |a delete|-file st|
|00004dd0| 61 72 74 75 70 2d 68 6f | 6f 6b 73 20 65 64 69 66 |artup-ho|oks edif|
|00004de0| 66 2d 77 6f 72 64 2d 6d | 6f 64 65 20 65 64 69 66 |f-word-m|ode edif|
|00004df0| 66 2d 6e 61 72 72 6f 77 | 2d 62 6f 75 6e 64 73 20 |f-narrow|-bounds |
|00004e00| 65 64 69 66 66 2d 6a 6f | 62 2d 6e 61 6d 65 5d 20 |ediff-jo|b-name] |
|00004e10| 31 32 5d 20 64 65 66 61 | 6c 69 61 73 20 65 64 69 |12] defa|lias edi|
|00004e20| 66 66 2d 6d 65 72 67 65 | 20 65 64 69 66 66 2d 6d |ff-merge| ediff-m|
|00004e30| 65 72 67 65 2d 66 69 6c | 65 73 20 65 64 69 66 66 |erge-fil|es ediff|
|00004e40| 2d 6d 65 72 67 65 2d 6f | 6e 2d 73 74 61 72 74 75 |-merge-o|n-startu|
|00004e50| 70 20 23 5b 6e 69 6c 20 | 22 c0 c1 21 88 70 1a 0b |p #[nil |"..!.p..|
|00004e60| ab 97 c4 0b 21 ab 92 c5 | c4 0b 21 21 ab 8b c6 8e |....!...|..!!....|
|00004e70| 0b 71 88 c7 c8 21 29 aa | 89 0e 09 ca 3d ae 83 cb |.q...!).|....=...|
|00004e80| cc 21 29 87 22 20 5b 65 | 64 69 66 66 2d 64 6f 2d |.!)." [e|diff-do-|
|00004e90| 6d 65 72 67 65 20 30 20 | 53 74 61 72 74 42 75 66 |merge 0 |StartBuf|
|00004ea0| 66 65 72 20 65 64 69 66 | 66 2d 62 75 66 66 65 72 |fer edif|f-buffer|
|00004eb0| 2d 43 20 67 65 74 2d 62 | 75 66 66 65 72 20 62 75 |-C get-b|uffer bu|
|00004ec0| 66 66 65 72 2d 6e 61 6d | 65 20 28 28 73 65 74 2d |ffer-nam|e ((set-|
|00004ed0| 62 75 66 66 65 72 20 53 | 74 61 72 74 42 75 66 66 |buffer S|tartBuff|
|00004ee0| 65 72 29 29 20 73 65 74 | 2d 62 75 66 66 65 72 2d |er)) set|-buffer-|
|00004ef0| 6d 6f 64 69 66 69 65 64 | 2d 70 20 6e 69 6c 20 74 |modified|-p nil t|
|00004f00| 68 69 73 2d 63 6f 6d 6d | 61 6e 64 20 65 64 69 66 |his-comm|and edif|
|00004f10| 66 2d 71 75 69 74 20 65 | 72 72 6f 72 20 22 59 6f |f-quit e|rror "Yo|
|00004f20| 75 27 76 65 20 6b 69 6c | 6c 65 64 20 61 6e 20 65 |u've kil|led an e|
|00004f30| 73 73 65 6e 74 69 61 6c | 20 45 64 69 66 66 20 62 |ssential| Ediff b|
|00004f40| 75 66 66 65 72 2d 2d 2d | 50 6c 65 61 73 65 20 71 |uffer---|Please q|
|00004f50| 75 69 74 20 45 64 69 66 | 66 22 5d 20 33 5d 20 62 |uit Edif|f"] 3] b|
|00004f60| 79 74 65 2d 6f 70 74 69 | 6d 69 7a 65 72 20 28 6e |yte-opti|mizer (n|
|00004f70| 69 6c 20 62 79 74 65 2d | 63 6f 6d 70 69 6c 65 2d |il byte-|compile-|
|00004f80| 69 6e 6c 69 6e 65 2d 65 | 78 70 61 6e 64 29 20 65 |inline-e|xpand) e|
|00004f90| 72 72 6f 72 20 22 25 73 | 20 61 6c 72 65 61 64 79 |rror "%s| already|
|00004fa0| 20 68 61 73 20 61 20 62 | 79 74 65 2d 6f 70 74 69 | has a b|yte-opti|
|00004fb0| 6d 69 7a 65 72 2c 20 63 | 61 6e 27 74 20 6d 61 6b |mizer, c|an't mak|
|00004fc0| 65 20 69 74 20 69 6e 6c | 69 6e 65 22 20 70 75 74 |e it inl|ine" put|
|00004fd0| 20 62 79 74 65 2d 63 6f | 6d 70 69 6c 65 2d 69 6e | byte-co|mpile-in|
|00004fe0| 6c 69 6e 65 2d 65 78 70 | 61 6e 64 5d 20 34 29 0a |line-exp|and] 4).|
|00004ff0| 28 66 73 65 74 20 27 65 | 64 69 66 66 2d 6d 65 72 |(fset 'e|diff-mer|
|00005000| 67 65 2d 66 69 6c 65 73 | 20 23 5b 28 66 69 6c 65 |ge-files| #[(file|
|00005010| 2d 41 20 66 69 6c 65 2d | 42 20 26 6f 70 74 69 6f |-A file-|B &optio|
|00005020| 6e 61 6c 20 73 74 61 72 | 74 75 70 2d 68 6f 6f 6b |nal star|tup-hook|
|00005030| 73 29 20 22 c0 09 42 11 | c2 0b c4 0d 21 ab 88 c6 |s) "..B.|....!...|
|00005040| c7 0b 21 0d 5c 22 aa 81 | 0d c8 09 c9 25 87 22 20 |..!.\"..|....%." |
|00005050| 5b 65 64 69 66 66 2d 6d | 65 72 67 65 2d 6f 6e 2d |[ediff-m|erge-on-|
|00005060| 73 74 61 72 74 75 70 20 | 73 74 61 72 74 75 70 2d |startup |startup-|
|00005070| 68 6f 6f 6b 73 20 65 64 | 69 66 66 2d 66 69 6c 65 |hooks ed|iff-file|
|00005080| 73 2d 69 6e 74 65 72 6e | 61 6c 20 66 69 6c 65 2d |s-intern|al file-|
|00005090| 41 20 66 69 6c 65 2d 64 | 69 72 65 63 74 6f 72 79 |A file-d|irectory|
|000050a0| 2d 70 20 66 69 6c 65 2d | 42 20 65 78 70 61 6e 64 |-p file-|B expand|
|000050b0| 2d 66 69 6c 65 2d 6e 61 | 6d 65 20 66 69 6c 65 2d |-file-na|me file-|
|000050c0| 6e 61 6d 65 2d 6e 6f 6e | 64 69 72 65 63 74 6f 72 |name-non|director|
|000050d0| 79 20 6e 69 6c 20 65 64 | 69 66 66 2d 6d 65 72 67 |y nil ed|iff-merg|
|000050e0| 65 2d 66 69 6c 65 73 5d | 20 36 20 22 5c 0a 4d 65 |e-files]| 6 "\.Me|
|000050f0| 72 67 65 20 74 77 6f 20 | 66 69 6c 65 73 20 77 69 |rge two |files wi|
|00005100| 74 68 6f 75 74 20 61 6e | 63 65 73 74 6f 72 2e 22 |thout an|cestor."|
|00005110| 20 28 62 79 74 65 2d 63 | 6f 64 65 20 22 08 ab 83 | (byte-c|ode "...|
|00005120| 09 aa 81 5c 6e c3 89 1c | 1d 1e 06 c7 c8 0e 06 c9 |...\n...|........|
|00005130| 70 21 ad 85 ca c9 70 21 | 21 23 89 14 c7 cb 08 ab |p!....p!|!#......|
|00005140| 84 0e 0c aa 83 cd 0c 21 | 89 15 ce ca 0c 21 0d 5c |.......!|.....!.\|
|00005150| 22 c3 1e 0f 1e 10 0e 0f | 3b ab 8e 0e 0f d1 42 43 |".......|;.....BC|
|00005160| 1e 12 d3 0e 10 21 29 aa | 8f 0e 14 ab 86 d3 0e 10 |.....!).|........|
|00005170| 21 aa 85 d3 0e 10 d5 5c | 22 2a 0e 16 42 16 16 0c |!......\|"*..B...|
|00005180| 23 2b 44 87 22 20 5b 65 | 64 69 66 66 2d 75 73 65 |#+D." [e|diff-use|
|00005190| 2d 6c 61 73 74 2d 64 69 | 72 20 65 64 69 66 66 2d |-last-di|r ediff-|
|000051a0| 6c 61 73 74 2d 64 69 72 | 2d 41 20 64 65 66 61 75 |last-dir|-A defau|
|000051b0| 6c 74 2d 64 69 72 65 63 | 74 6f 72 79 20 6e 69 6c |lt-direc|tory nil|
|000051c0| 20 66 20 64 69 72 2d 42 | 20 64 69 72 2d 41 20 65 | f dir-B| dir-A e|
|000051d0| 64 69 66 66 2d 72 65 61 | 64 2d 66 69 6c 65 2d 6e |diff-rea|d-file-n|
|000051e0| 61 6d 65 20 22 46 69 6c | 65 20 41 20 74 6f 20 6d |ame "Fil|e A to m|
|000051f0| 65 72 67 65 22 20 62 75 | 66 66 65 72 2d 66 69 6c |erge" bu|ffer-fil|
|00005200| 65 2d 6e 61 6d 65 20 66 | 69 6c 65 2d 6e 61 6d 65 |e-name f|ile-name|
|00005210| 2d 6e 6f 6e 64 69 72 65 | 63 74 6f 72 79 20 22 46 |-nondire|ctory "F|
|00005220| 69 6c 65 20 42 20 74 6f | 20 6d 65 72 67 65 22 20 |ile B to| merge" |
|00005230| 65 64 69 66 66 2d 6c 61 | 73 74 2d 64 69 72 2d 42 |ediff-la|st-dir-B|
|00005240| 20 66 69 6c 65 2d 6e 61 | 6d 65 2d 64 69 72 65 63 | file-na|me-direc|
|00005250| 74 6f 72 79 20 65 78 70 | 61 6e 64 2d 66 69 6c 65 |tory exp|and-file|
|00005260| 2d 6e 61 6d 65 20 64 69 | 72 20 66 69 6c 65 20 22 |-name di|r file "|
|00005270| 22 20 64 69 72 65 63 74 | 6f 72 79 2d 61 62 62 72 |" direct|ory-abbr|
|00005280| 65 76 2d 61 6c 69 73 74 | 20 61 62 62 72 65 76 69 |ev-alist| abbrevi|
|00005290| 61 74 65 2d 66 69 6c 65 | 2d 6e 61 6d 65 20 65 64 |ate-file|-name ed|
|000052a0| 69 66 66 2d 65 6d 61 63 | 73 2d 70 20 74 20 66 69 |iff-emac|s-p t fi|
|000052b0| 6c 65 2d 6e 61 6d 65 2d | 68 69 73 74 6f 72 79 5d |le-name-|history]|
|000052c0| 20 37 29 5d 29 0a 28 66 | 73 65 74 20 27 65 64 69 | 7)]).(f|set 'edi|
|000052d0| 66 66 2d 6d 65 72 67 65 | 2d 66 69 6c 65 73 2d 77 |ff-merge|-files-w|
|000052e0| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 20 23 5b 28 |ith-ance|stor #[(|
|000052f0| 66 69 6c 65 2d 41 20 66 | 69 6c 65 2d 42 20 66 69 |file-A f|ile-B fi|
|00005300| 6c 65 2d 61 6e 63 65 73 | 74 6f 72 20 26 6f 70 74 |le-ances|tor &opt|
|00005310| 69 6f 6e 61 6c 20 73 74 | 61 72 74 75 70 2d 68 6f |ional st|artup-ho|
|00005320| 6f 6b 73 29 20 22 c0 09 | 42 11 c2 0b c4 0d 21 ab |oks) "..|B.....!.|
|00005330| 88 c6 c7 0b 21 0d 5c 22 | aa 81 0d 0e 08 09 c9 25 |....!.\"|.......%|
|00005340| 87 22 20 5b 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |." [edif|f-merge-|
|00005350| 6f 6e 2d 73 74 61 72 74 | 75 70 20 73 74 61 72 74 |on-start|up start|
|00005360| 75 70 2d 68 6f 6f 6b 73 | 20 65 64 69 66 66 2d 66 |up-hooks| ediff-f|
|00005370| 69 6c 65 73 2d 69 6e 74 | 65 72 6e 61 6c 20 66 69 |iles-int|ernal fi|
|00005380| 6c 65 2d 41 20 66 69 6c | 65 2d 64 69 72 65 63 74 |le-A fil|e-direct|
|00005390| 6f 72 79 2d 70 20 66 69 | 6c 65 2d 42 20 65 78 70 |ory-p fi|le-B exp|
|000053a0| 61 6e 64 2d 66 69 6c 65 | 2d 6e 61 6d 65 20 66 69 |and-file|-name fi|
|000053b0| 6c 65 2d 6e 61 6d 65 2d | 6e 6f 6e 64 69 72 65 63 |le-name-|nondirec|
|000053c0| 74 6f 72 79 20 66 69 6c | 65 2d 61 6e 63 65 73 74 |tory fil|e-ancest|
|000053d0| 6f 72 20 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 66 |or ediff|-merge-f|
|000053e0| 69 6c 65 73 2d 77 69 74 | 68 2d 61 6e 63 65 73 74 |iles-wit|h-ancest|
|000053f0| 6f 72 5d 20 36 20 22 5c | 0a 4d 65 72 67 65 20 74 |or] 6 "\|.Merge t|
|00005400| 77 6f 20 66 69 6c 65 73 | 20 77 69 74 68 20 61 6e |wo files| with an|
|00005410| 63 65 73 74 6f 72 2e 22 | 20 28 62 79 74 65 2d 63 |cestor."| (byte-c|
|00005420| 6f 64 65 20 22 08 ab 83 | 09 aa 81 5c 6e c3 89 89 |ode "...|...\n...|
|00005430| 89 1c 1d 1e 06 1e 07 1e | 08 c9 ca 0e 08 cb 70 21 |........|......p!|
|00005440| ad 85 cc cb 70 21 21 23 | 89 15 c9 cd 08 ab 84 0e |....p!!#|........|
|00005450| 0e aa 83 cf 0d 21 89 16 | 07 d0 cc 0d 21 0e 07 5c |.....!..|....!..\|
|00005460| 22 c3 1e 11 1e 12 0e 11 | 3b ab 8e 0e 11 d3 42 43 |".......|;.....BC|
|00005470| 1e 14 d5 0e 12 21 29 aa | 8f 0e 16 ab 86 d5 0e 12 |.....!).|........|
|00005480| 21 aa 85 d5 0e 12 d7 5c | 22 2a 0e 18 42 16 18 0d |!......\|"*..B...|
|00005490| 23 89 14 c9 d9 08 ab 84 | 0e 1a aa 83 cf 0c 21 89 |#.......|......!.|
|000054a0| 16 06 d0 cc 0c 21 0e 06 | 5c 22 c3 1e 11 1e 12 0e |.....!..|\"......|
|000054b0| 11 3b ab 8e 0e 11 d3 42 | 43 1e 14 d5 0e 12 21 29 |.;.....B|C.....!)|
|000054c0| aa 8f 0e 16 ab 86 d5 0e | 12 21 aa 85 d5 0e 12 d7 |........|.!......|
|000054d0| 5c 22 2a 0e 18 42 16 18 | 0c 23 45 2d 87 22 20 5b |\"*..B..|.#E-." [|
|000054e0| 65 64 69 66 66 2d 75 73 | 65 2d 6c 61 73 74 2d 64 |ediff-us|e-last-d|
|000054f0| 69 72 20 65 64 69 66 66 | 2d 6c 61 73 74 2d 64 69 |ir ediff|-last-di|
|00005500| 72 2d 41 20 64 65 66 61 | 75 6c 74 2d 64 69 72 65 |r-A defa|ult-dire|
|00005510| 63 74 6f 72 79 20 6e 69 | 6c 20 66 66 20 66 20 64 |ctory ni|l ff f d|
|00005520| 69 72 2d 61 6e 63 65 73 | 74 6f 72 20 64 69 72 2d |ir-ances|tor dir-|
|00005530| 42 20 64 69 72 2d 41 20 | 65 64 69 66 66 2d 72 65 |B dir-A |ediff-re|
|00005540| 61 64 2d 66 69 6c 65 2d | 6e 61 6d 65 20 22 46 69 |ad-file-|name "Fi|
|00005550| 6c 65 20 41 20 74 6f 20 | 6d 65 72 67 65 22 20 62 |le A to |merge" b|
|00005560| 75 66 66 65 72 2d 66 69 | 6c 65 2d 6e 61 6d 65 20 |uffer-fi|le-name |
|00005570| 66 69 6c 65 2d 6e 61 6d | 65 2d 6e 6f 6e 64 69 72 |file-nam|e-nondir|
|00005580| 65 63 74 6f 72 79 20 22 | 46 69 6c 65 20 42 20 74 |ectory "|File B t|
|00005590| 6f 20 6d 65 72 67 65 22 | 20 65 64 69 66 66 2d 6c |o merge"| ediff-l|
|000055a0| 61 73 74 2d 64 69 72 2d | 42 20 66 69 6c 65 2d 6e |ast-dir-|B file-n|
|000055b0| 61 6d 65 2d 64 69 72 65 | 63 74 6f 72 79 20 65 78 |ame-dire|ctory ex|
|000055c0| 70 61 6e 64 2d 66 69 6c | 65 2d 6e 61 6d 65 20 64 |pand-fil|e-name d|
|000055d0| 69 72 20 66 69 6c 65 20 | 22 22 20 64 69 72 65 63 |ir file |"" direc|
|000055e0| 74 6f 72 79 2d 61 62 62 | 72 65 76 2d 61 6c 69 73 |tory-abb|rev-alis|
|000055f0| 74 20 61 62 62 72 65 76 | 69 61 74 65 2d 66 69 6c |t abbrev|iate-fil|
|00005600| 65 2d 6e 61 6d 65 20 65 | 64 69 66 66 2d 65 6d 61 |e-name e|diff-ema|
|00005610| 63 73 2d 70 20 74 20 66 | 69 6c 65 2d 6e 61 6d 65 |cs-p t f|ile-name|
|00005620| 2d 68 69 73 74 6f 72 79 | 20 22 41 6e 63 65 73 74 |-history| "Ancest|
|00005630| 6f 72 20 66 69 6c 65 22 | 20 65 64 69 66 66 2d 6c |or file"| ediff-l|
|00005640| 61 73 74 2d 64 69 72 2d | 61 6e 63 65 73 74 6f 72 |ast-dir-|ancestor|
|00005650| 5d 20 38 29 5d 29 0a 28 | 64 65 66 61 6c 69 61 73 |] 8)]).(|defalias|
|00005660| 20 27 65 64 69 66 66 2d | 6d 65 72 67 65 2d 77 69 | 'ediff-|merge-wi|
|00005670| 74 68 2d 61 6e 63 65 73 | 74 6f 72 20 27 65 64 69 |th-ances|tor 'edi|
|00005680| 66 66 2d 6d 65 72 67 65 | 2d 66 69 6c 65 73 2d 77 |ff-merge|-files-w|
|00005690| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 29 0a 28 66 |ith-ance|stor).(f|
|000056a0| 73 65 74 20 27 65 64 69 | 66 66 2d 6d 65 72 67 65 |set 'edi|ff-merge|
|000056b0| 2d 62 75 66 66 65 72 73 | 20 23 5b 28 62 75 66 66 |-buffers| #[(buff|
|000056c0| 65 72 2d 41 20 62 75 66 | 66 65 72 2d 42 20 26 6f |er-A buf|fer-B &o|
|000056d0| 70 74 69 6f 6e 61 6c 20 | 73 74 61 72 74 75 70 2d |ptional |startup-|
|000056e0| 68 6f 6f 6b 73 20 6a 6f | 62 2d 6e 61 6d 65 29 20 |hooks jo|b-name) |
|000056f0| 22 c0 09 42 11 5c 6e ac | 82 c3 12 c4 0d 0e 06 c7 |"..B.\n.|........|
|00005700| 09 5c 6e 25 87 22 20 5b | 65 64 69 66 66 2d 6d 65 |.\n%." [|ediff-me|
|00005710| 72 67 65 2d 6f 6e 2d 73 | 74 61 72 74 75 70 20 73 |rge-on-s|tartup s|
|00005720| 74 61 72 74 75 70 2d 68 | 6f 6f 6b 73 20 6a 6f 62 |tartup-h|ooks job|
|00005730| 2d 6e 61 6d 65 20 65 64 | 69 66 66 2d 6d 65 72 67 |-name ed|iff-merg|
|00005740| 65 2d 62 75 66 66 65 72 | 73 20 65 64 69 66 66 2d |e-buffer|s ediff-|
|00005750| 62 75 66 66 65 72 73 2d | 69 6e 74 65 72 6e 61 6c |buffers-|internal|
|00005760| 20 62 75 66 66 65 72 2d | 41 20 62 75 66 66 65 72 | buffer-|A buffer|
|00005770| 2d 42 20 6e 69 6c 5d 20 | 36 20 22 5c 0a 4d 65 72 |-B nil] |6 "\.Mer|
|00005780| 67 65 20 62 75 66 66 65 | 72 73 20 77 69 74 68 6f |ge buffe|rs witho|
|00005790| 75 74 20 61 6e 63 65 73 | 74 6f 72 2e 22 20 28 62 |ut ances|tor." (b|
|000057a0| 79 74 65 2d 63 6f 64 65 | 20 22 c0 19 c2 c3 c4 c5 |yte-code| "......|
|000057b0| 21 c6 23 89 11 c2 c7 c8 | 8b 88 c4 09 21 c6 23 29 |!.#.....|....!.#)|
|000057c0| 44 87 22 20 5b 6e 69 6c | 20 62 66 20 72 65 61 64 |D." [nil| bf read|
|000057d0| 2d 62 75 66 66 65 72 20 | 22 42 75 66 66 65 72 20 |-buffer |"Buffer |
|000057e0| 41 20 74 6f 20 6d 65 72 | 67 65 3a 20 22 20 65 64 |A to mer|ge: " ed|
|000057f0| 69 66 66 2d 6f 74 68 65 | 72 2d 62 75 66 66 65 72 |iff-othe|r-buffer|
|00005800| 20 22 22 20 74 20 22 42 | 75 66 66 65 72 20 42 20 | "" t "B|uffer B |
|00005810| 74 6f 20 6d 65 72 67 65 | 3a 20 22 20 28 28 6f 74 |to merge|: " ((ot|
|00005820| 68 65 72 2d 77 69 6e 64 | 6f 77 20 31 29 29 5d 20 |her-wind|ow 1))] |
|00005830| 35 29 5d 29 0a 28 66 73 | 65 74 20 27 65 64 69 66 |5)]).(fs|et 'edif|
|00005840| 66 2d 6d 65 72 67 65 2d | 62 75 66 66 65 72 73 2d |f-merge-|buffers-|
|00005850| 77 69 74 68 2d 61 6e 63 | 65 73 74 6f 72 20 23 5b |with-anc|estor #[|
|00005860| 28 62 75 66 66 65 72 2d | 41 20 62 75 66 66 65 72 |(buffer-|A buffer|
|00005870| 2d 42 20 62 75 66 66 65 | 72 2d 61 6e 63 65 73 74 |-B buffe|r-ancest|
|00005880| 6f 72 20 26 6f 70 74 69 | 6f 6e 61 6c 20 73 74 61 |or &opti|onal sta|
|00005890| 72 74 75 70 2d 68 6f 6f | 6b 73 20 6a 6f 62 2d 6e |rtup-hoo|ks job-n|
|000058a0| 61 6d 65 29 20 22 c0 09 | 42 11 5c 6e ac 82 c3 12 |ame) "..|B.\n....|
|000058b0| c4 0d 0e 06 0e 07 09 5c | 6e 25 87 22 20 5b 65 64 |.......\|n%." [ed|
|000058c0| 69 66 66 2d 6d 65 72 67 | 65 2d 6f 6e 2d 73 74 61 |iff-merg|e-on-sta|
|000058d0| 72 74 75 70 20 73 74 61 | 72 74 75 70 2d 68 6f 6f |rtup sta|rtup-hoo|
|000058e0| 6b 73 20 6a 6f 62 2d 6e | 61 6d 65 20 65 64 69 66 |ks job-n|ame edif|
|000058f0| 66 2d 6d 65 72 67 65 2d | 62 75 66 66 65 72 73 2d |f-merge-|buffers-|
|00005900| 77 69 74 68 2d 61 6e 63 | 65 73 74 6f 72 20 65 64 |with-anc|estor ed|
|00005910| 69 66 66 2d 62 75 66 66 | 65 72 73 2d 69 6e 74 65 |iff-buff|ers-inte|
|00005920| 72 6e 61 6c 20 62 75 66 | 66 65 72 2d 41 20 62 75 |rnal buf|fer-A bu|
|00005930| 66 66 65 72 2d 42 20 62 | 75 66 66 65 72 2d 61 6e |ffer-B b|uffer-an|
|00005940| 63 65 73 74 6f 72 5d 20 | 36 20 22 5c 0a 4d 65 72 |cestor] |6 "\.Mer|
|00005950| 67 65 20 62 75 66 66 65 | 72 73 20 77 69 74 68 20 |ge buffe|rs with |
|00005960| 61 6e 63 65 73 74 6f 72 | 2e 22 20 28 62 79 74 65 |ancestor|." (byte|
|00005970| 2d 63 6f 64 65 20 22 c0 | 89 19 1a c3 c4 c5 c6 21 |-code ".|.......!|
|00005980| c7 23 89 12 c3 c8 c9 8b | 88 c5 5c 6e 21 c7 23 89 |.#......|..\n!.#.|
|00005990| 11 c3 ca cb 8b 88 c5 5c | 6e 09 44 21 c7 23 45 2a |.......\|n.D!.#E*|
|000059a0| 87 22 20 5b 6e 69 6c 20 | 62 66 66 20 62 66 20 72 |." [nil |bff bf r|
|000059b0| 65 61 64 2d 62 75 66 66 | 65 72 20 22 42 75 66 66 |ead-buff|er "Buff|
|000059c0| 65 72 20 41 20 74 6f 20 | 6d 65 72 67 65 3a 20 22 |er A to |merge: "|
|000059d0| 20 65 64 69 66 66 2d 6f | 74 68 65 72 2d 62 75 66 | ediff-o|ther-buf|
|000059e0| 66 65 72 20 22 22 20 74 | 20 22 42 75 66 66 65 72 |fer "" t| "Buffer|
|000059f0| 20 42 20 74 6f 20 6d 65 | 72 67 65 3a 20 22 20 28 | B to me|rge: " (|
|00005a00| 28 6f 74 68 65 72 2d 77 | 69 6e 64 6f 77 20 31 29 |(other-w|indow 1)|
|00005a10| 29 20 22 41 6e 63 65 73 | 74 6f 72 20 62 75 66 66 |) "Ances|tor buff|
|00005a20| 65 72 3a 20 22 20 28 28 | 6f 74 68 65 72 2d 77 69 |er: " ((|other-wi|
|00005a30| 6e 64 6f 77 20 31 29 29 | 5d 20 37 29 5d 29 0a 28 |ndow 1))|] 7)]).(|
|00005a40| 66 73 65 74 20 27 65 64 | 69 66 66 2d 6d 65 72 67 |fset 'ed|iff-merg|
|00005a50| 65 2d 72 65 76 69 73 69 | 6f 6e 73 20 23 5b 28 26 |e-revisi|ons #[(&|
|00005a60| 6f 70 74 69 6f 6e 61 6c | 20 66 69 6c 65 20 73 74 |optional| file st|
|00005a70| 61 72 74 75 70 2d 68 6f | 6f 6b 73 29 20 22 c0 20 |artup-ho|oks) ". |
|00005a80| 88 09 3b ab 84 c2 09 21 | 88 c3 89 89 89 1c 1d 1e |..;....!|........|
|00005a90| 06 1e 07 c8 c9 ca 09 3b | ab 85 cb 09 21 aa 81 cc |.......;|....!...|
|00005aa0| 5c 22 21 16 07 c8 c9 cd | 09 3b ab 85 cb 09 21 aa |\"!.....|.;....!.|
|00005ab0| 81 cc 5c 22 21 16 06 0e | 0e cf 3d ab b2 8a d0 0e |..\"!...|..=.....|
|00005ac0| 07 21 88 70 15 29 8a 0e | 06 d1 98 ac 85 d0 0e 06 |.!.p.)..|........|
|00005ad0| 21 88 70 14 29 d2 c3 d3 | d4 0d 21 44 d5 0e 06 d1 |!.p.)...|..!D....|
|00005ae0| 98 d3 d4 0c 21 44 45 46 | 0e 16 42 16 16 aa 93 d7 |....!DEF|..B.....|
|00005af0| 0e 07 21 15 0e 06 d1 98 | ab 83 70 aa 84 d7 0e 06 |..!.....|..p.....|
|00005b00| 21 14 d8 0d 0c 0e 16 d9 | 24 2c 87 22 20 5b 65 64 |!.......|$,." [ed|
|00005b10| 69 66 66 2d 6c 6f 61 64 | 2d 76 65 72 73 69 6f 6e |iff-load|-version|
|00005b20| 2d 63 6f 6e 74 72 6f 6c | 20 66 69 6c 65 20 66 69 |-control| file fi|
|00005b30| 6e 64 2d 66 69 6c 65 20 | 6e 69 6c 20 62 75 66 32 |nd-file |nil buf2|
|00005b40| 20 62 75 66 31 20 72 65 | 76 32 20 72 65 76 31 20 | buf1 re|v2 rev1 |
|00005b50| 72 65 61 64 2d 73 74 72 | 69 6e 67 20 66 6f 72 6d |read-str|ing form|
|00005b60| 61 74 20 22 56 65 72 73 | 69 6f 6e 20 31 20 74 6f |at "Vers|ion 1 to|
|00005b70| 20 6d 65 72 67 65 20 28 | 64 65 66 61 75 6c 74 3a | merge (|default:|
|00005b80| 20 25 73 27 73 20 6c 61 | 74 65 73 74 20 76 65 72 | %s's la|test ver|
|00005b90| 73 69 6f 6e 29 3a 20 22 | 20 66 69 6c 65 2d 6e 61 |sion): "| file-na|
|00005ba0| 6d 65 2d 6e 6f 6e 64 69 | 72 65 63 74 6f 72 79 20 |me-nondi|rectory |
|00005bb0| 22 63 75 72 72 65 6e 74 | 20 62 75 66 66 65 72 22 |"current| buffer"|
|00005bc0| 20 22 56 65 72 73 69 6f | 6e 20 32 20 74 6f 20 6d | "Versio|n 2 to m|
|00005bd0| 65 72 67 65 20 28 64 65 | 66 61 75 6c 74 3a 20 25 |erge (de|fault: %|
|00005be0| 73 29 3a 20 22 20 65 64 | 69 66 66 2d 76 65 72 73 |s): " ed|iff-vers|
|00005bf0| 69 6f 6e 2d 63 6f 6e 74 | 72 6f 6c 2d 70 61 63 6b |ion-cont|rol-pack|
|00005c00| 61 67 65 20 76 63 20 76 | 63 2d 76 65 72 73 69 6f |age vc v|c-versio|
|00005c10| 6e 2d 6f 74 68 65 72 2d | 77 69 6e 64 6f 77 20 22 |n-other-|window "|
|00005c20| 22 20 6c 61 6d 62 64 61 | 20 64 65 6c 65 74 65 2d |" lambda| delete-|
|00005c30| 66 69 6c 65 20 62 75 66 | 66 65 72 2d 66 69 6c 65 |file buf|fer-file|
|00005c40| 2d 6e 61 6d 65 20 6f 72 | 20 73 74 61 72 74 75 70 |-name or| startup|
|00005c50| 2d 68 6f 6f 6b 73 20 72 | 63 73 2d 65 64 69 66 66 |-hooks r|cs-ediff|
|00005c60| 2d 76 69 65 77 2d 72 65 | 76 69 73 69 6f 6e 20 65 |-view-re|vision e|
|00005c70| 64 69 66 66 2d 6d 65 72 | 67 65 2d 62 75 66 66 65 |diff-mer|ge-buffe|
|00005c80| 72 73 20 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 72 |rs ediff|-merge-r|
|00005c90| 65 76 69 73 69 6f 6e 73 | 5d 20 38 20 22 5c 0a 52 |evisions|] 8 "\.R|
|00005ca0| 75 6e 20 45 64 69 66 66 | 20 62 79 20 6d 65 72 67 |un Ediff| by merg|
|00005cb0| 69 6e 67 20 74 77 6f 20 | 72 65 76 69 73 69 6f 6e |ing two |revision|
|00005cc0| 73 20 6f 66 20 61 20 66 | 69 6c 65 2e 0a 54 68 65 |s of a f|ile..The|
|00005cd0| 20 66 69 6c 65 20 69 73 | 20 74 68 65 20 6f 70 74 | file is| the opt|
|00005ce0| 69 6f 6e 61 6c 20 46 49 | 4c 45 20 61 72 67 75 6d |ional FI|LE argum|
|00005cf0| 65 6e 74 20 6f 72 20 74 | 68 65 20 66 69 6c 65 20 |ent or t|he file |
|00005d00| 76 69 73 69 74 65 64 20 | 62 79 20 74 68 65 20 63 |visited |by the c|
|00005d10| 75 72 72 65 6e 74 0a 62 | 75 66 66 65 72 2e 22 20 |urrent.b|uffer." |
|00005d20| 6e 69 6c 5d 29 0a 28 66 | 73 65 74 20 27 65 64 69 |nil]).(f|set 'edi|
|00005d30| 66 66 2d 6d 65 72 67 65 | 2d 72 65 76 69 73 69 6f |ff-merge|-revisio|
|00005d40| 6e 73 2d 77 69 74 68 2d | 61 6e 63 65 73 74 6f 72 |ns-with-|ancestor|
|00005d50| 20 23 5b 28 26 6f 70 74 | 69 6f 6e 61 6c 20 66 69 | #[(&opt|ional fi|
|00005d60| 6c 65 20 73 74 61 72 74 | 75 70 2d 68 6f 6f 6b 73 |le start|up-hooks|
|00005d70| 29 20 22 c0 20 88 09 3b | ab 84 c2 09 21 88 c3 89 |) ". ..;|....!...|
|00005d80| 89 89 89 89 1c 1d 1e 06 | 1e 07 1e 08 1e 09 ca cb |........|........|
|00005d90| cc 09 3b ab 85 cd 09 21 | aa 81 ce 5c 22 21 16 09 |..;....!|...\"!..|
|00005da0| ca cb cf 09 3b ab 85 cd | 09 21 aa 81 ce 5c 22 21 |....;...|.!...\"!|
|00005db0| 16 08 ca cb d0 09 3b ab | 85 cd 09 21 aa 81 ce 5c |......;.|...!...\|
|00005dc0| 22 21 16 07 0e 11 d2 3d | ab cf 8a d3 0e 09 21 88 |"!.....=|......!.|
|00005dd0| 70 16 06 29 8a 0e 08 d4 | 98 ac 85 d3 0e 08 21 88 |p..)....|......!.|
|00005de0| 70 15 29 8a 0e 07 d4 98 | ac 85 d3 0e 07 21 88 70 |p.).....|.....!.p|
|00005df0| 14 29 d5 c3 d6 d7 0e 06 | 21 44 d8 0e 08 d4 98 d6 |.)......|!D......|
|00005e00| d7 0d 21 44 45 d8 0e 07 | d4 98 d6 d7 0c 21 44 45 |..!DE...|.....!DE|
|00005e10| af 05 0e 19 42 16 19 aa | a2 da 0e 09 21 16 06 0e |....B...|....!...|
|00005e20| 08 d4 98 ab 83 70 aa 84 | da 0e 08 21 15 0e 07 d4 |.....p..|...!....|
|00005e30| 98 ab 83 70 aa 84 da 0e | 07 21 14 db 0e 06 0d 0c |...p....|.!......|
|00005e40| 0e 19 dc 25 2e 06 87 22 | 20 5b 65 64 69 66 66 2d |...%..."| [ediff-|
|00005e50| 6c 6f 61 64 2d 76 65 72 | 73 69 6f 6e 2d 63 6f 6e |load-ver|sion-con|
|00005e60| 74 72 6f 6c 20 66 69 6c | 65 20 66 69 6e 64 2d 66 |trol fil|e find-f|
|00005e70| 69 6c 65 20 6e 69 6c 20 | 61 6e 63 65 73 74 6f 72 |ile nil |ancestor|
|00005e80| 2d 62 75 66 20 62 75 66 | 32 20 62 75 66 31 20 61 |-buf buf|2 buf1 a|
|00005e90| 6e 63 65 73 74 6f 72 2d | 72 65 76 20 72 65 76 32 |ncestor-|rev rev2|
|00005ea0| 20 72 65 76 31 20 72 65 | 61 64 2d 73 74 72 69 6e | rev1 re|ad-strin|
|00005eb0| 67 20 66 6f 72 6d 61 74 | 20 22 56 65 72 73 69 6f |g format| "Versio|
|00005ec0| 6e 20 31 20 74 6f 20 6d | 65 72 67 65 20 28 64 65 |n 1 to m|erge (de|
|00005ed0| 66 61 75 6c 74 3a 20 25 | 73 27 73 20 6c 61 74 65 |fault: %|s's late|
|00005ee0| 73 74 20 76 65 72 73 69 | 6f 6e 29 3a 20 22 20 66 |st versi|on): " f|
|00005ef0| 69 6c 65 2d 6e 61 6d 65 | 2d 6e 6f 6e 64 69 72 65 |ile-name|-nondire|
|00005f00| 63 74 6f 72 79 20 22 63 | 75 72 72 65 6e 74 20 62 |ctory "c|urrent b|
|00005f10| 75 66 66 65 72 22 20 22 | 56 65 72 73 69 6f 6e 20 |uffer" "|Version |
|00005f20| 32 20 74 6f 20 6d 65 72 | 67 65 20 28 64 65 66 61 |2 to mer|ge (defa|
|00005f30| 75 6c 74 3a 20 25 73 29 | 3a 20 22 20 22 41 6e 63 |ult: %s)|: " "Anc|
|00005f40| 65 73 74 6f 72 20 76 65 | 72 73 69 6f 6e 20 28 64 |estor ve|rsion (d|
|00005f50| 65 66 61 75 6c 74 3a 20 | 25 73 29 3a 20 22 20 65 |efault: |%s): " e|
|00005f60| 64 69 66 66 2d 76 65 72 | 73 69 6f 6e 2d 63 6f 6e |diff-ver|sion-con|
|00005f70| 74 72 6f 6c 2d 70 61 63 | 6b 61 67 65 20 76 63 20 |trol-pac|kage vc |
|00005f80| 76 63 2d 76 65 72 73 69 | 6f 6e 2d 6f 74 68 65 72 |vc-versi|on-other|
|00005f90| 2d 77 69 6e 64 6f 77 20 | 22 22 20 6c 61 6d 62 64 |-window |"" lambd|
|00005fa0| 61 20 64 65 6c 65 74 65 | 2d 66 69 6c 65 20 62 75 |a delete|-file bu|
|00005fb0| 66 66 65 72 2d 66 69 6c | 65 2d 6e 61 6d 65 20 6f |ffer-fil|e-name o|
|00005fc0| 72 20 73 74 61 72 74 75 | 70 2d 68 6f 6f 6b 73 20 |r startu|p-hooks |
|00005fd0| 72 63 73 2d 65 64 69 66 | 66 2d 76 69 65 77 2d 72 |rcs-edif|f-view-r|
|00005fe0| 65 76 69 73 69 6f 6e 20 | 65 64 69 66 66 2d 6d 65 |evision |ediff-me|
|00005ff0| 72 67 65 2d 62 75 66 66 | 65 72 73 2d 77 69 74 68 |rge-buff|ers-with|
|00006000| 2d 61 6e 63 65 73 74 6f | 72 20 65 64 69 66 66 2d |-ancesto|r ediff-|
|00006010| 6d 65 72 67 65 2d 72 65 | 76 69 73 69 6f 6e 73 2d |merge-re|visions-|
|00006020| 77 69 74 68 2d 61 6e 63 | 65 73 74 6f 72 5d 20 39 |with-anc|estor] 9|
|00006030| 20 22 5c 0a 52 75 6e 20 | 45 64 69 66 66 20 62 79 | "\.Run |Ediff by|
|00006040| 20 6d 65 72 67 69 6e 67 | 20 74 77 6f 20 72 65 76 | merging| two rev|
|00006050| 69 73 69 6f 6e 73 20 6f | 66 20 61 20 66 69 6c 65 |isions o|f a file|
|00006060| 20 77 69 74 68 20 61 20 | 63 6f 6d 6d 6f 6e 20 61 | with a |common a|
|00006070| 6e 63 65 73 74 6f 72 2e | 0a 54 68 65 20 66 69 6c |ncestor.|.The fil|
|00006080| 65 20 69 73 20 74 68 65 | 20 74 68 65 20 6f 70 74 |e is the| the opt|
|00006090| 69 6f 6e 61 6c 20 46 49 | 4c 45 20 61 72 67 75 6d |ional FI|LE argum|
|000060a0| 65 6e 74 20 6f 72 20 74 | 68 65 20 66 69 6c 65 20 |ent or t|he file |
|000060b0| 76 69 73 69 74 65 64 20 | 62 79 20 74 68 65 20 63 |visited |by the c|
|000060c0| 75 72 72 65 6e 74 0a 62 | 75 66 66 65 72 2e 22 20 |urrent.b|uffer." |
|000060d0| 6e 69 6c 5d 29 0a 28 66 | 73 65 74 20 27 65 64 69 |nil]).(f|set 'edi|
|000060e0| 66 66 2d 70 61 74 63 68 | 2d 62 75 66 66 65 72 20 |ff-patch|-buffer |
|000060f0| 23 5b 28 62 75 66 66 65 | 72 2d 6e 61 6d 65 20 26 |#[(buffe|r-name &|
|00006100| 6f 70 74 69 6f 6e 61 6c | 20 73 74 61 72 74 75 70 |optional| startup|
|00006110| 2d 68 6f 6f 6b 73 29 20 | 22 c0 09 21 89 1a ad 83 |-hooks) |"..!....|
|00006120| c3 5c 6e 21 1c c5 5c 6e | 21 1e 06 c7 1e 08 c7 1e |.\n!..\n|!.......|
|00006130| 09 c7 1e 5c 6e 0c ab 85 | 0c 16 09 aa c5 70 1e 0b |...\n...|.....p..|
|00006140| 09 ab b4 c0 09 21 ab af | c1 c0 09 21 21 ab a8 cc |.....!..|...!!...|
|00006150| 8e 09 71 88 0e 0d 16 08 | ce 09 21 16 09 cf 0e 09 |..q.....|..!.....|
|00006160| 21 88 c7 16 10 d1 09 21 | 88 d2 c7 21 88 d3 20 88 |!......!|...!.. .|
|00006170| 0e 08 16 0d 29 aa 8a 0e | 14 d5 3d ac 84 d6 d7 21 |....)...|..=....!|
|00006180| 88 29 d8 0e 09 0e 19 da | 23 16 5c 6e 0c 3f 85 2d |.)......|#.\n.?.-|
|00006190| 01 70 1e 0b 0e 5c 6e 83 | 23 01 c0 0e 5c 6e 21 83 |.p...\n.|#...\n!.|
|000061a0| 23 01 c1 c0 0e 5c 6e 21 | 21 83 23 01 db 8e 0e 5c |#....\n!|!.#....\|
|000061b0| 6e 71 88 dc c3 0e 1d 21 | 21 88 dc c3 0e 1e 21 21 |nq.....!|!.....!!|
|000061c0| 88 70 1e 0b 0e 1d ab ac | c0 0e 1d 21 ab a6 c1 c0 |.p......|...!....|
|000061d0| 0e 1d 21 21 ab 9e df 8e | 0e 1d 71 88 0e 08 ab 84 |..!!....|..q.....|
|000061e0| 0e 08 16 0d cf c7 21 88 | d1 09 21 88 d2 0e 06 21 |......!.|..!....!|
|000061f0| 88 29 aa 8a 0e 14 d5 3d | ac 84 d6 d7 21 88 29 70 |.).....=|....!.)p|
|00006200| 1e 0b 0e 1e ab b2 c0 0e | 1e 21 ab ac c1 c0 0e 1e |........|.!......|
|00006210| 21 21 ab a4 e0 8e 0e 1e | 71 88 c7 16 10 0e 08 ab |!!......|q.......|
|00006220| 84 0e 08 16 0d cf c7 21 | 88 d1 e1 09 e2 50 e3 5c |.......!|.....P.\|
|00006230| 22 21 88 d2 e4 21 29 aa | 89 0e 14 d5 3d ae 83 d6 |"!...!).|....=...|
|00006240| d7 21 2a aa 89 0e 14 d5 | 3d ae 83 d6 d7 21 29 2e |.!*.....|=....!).|
|00006250| 06 87 22 20 5b 67 65 74 | 2d 62 75 66 66 65 72 20 |.." [get|-buffer |
|00006260| 62 75 66 66 65 72 2d 6e | 61 6d 65 20 62 75 66 2d |buffer-n|ame buf-|
|00006270| 74 6f 2d 70 61 74 63 68 | 20 62 75 66 66 65 72 2d |to-patch| buffer-|
|00006280| 66 69 6c 65 2d 6e 61 6d | 65 20 66 69 6c 65 2d 6e |file-nam|e file-n|
|00006290| 61 6d 65 2d 6f 6b 20 62 | 75 66 66 65 72 2d 6d 6f |ame-ok b|uffer-mo|
|000062a0| 64 69 66 69 65 64 2d 70 | 20 62 75 66 2d 6d 6f 64 |dified-p| buf-mod|
|000062b0| 2d 73 74 61 74 75 73 20 | 6e 69 6c 20 64 65 66 61 |-status |nil defa|
|000062c0| 75 6c 74 2d 64 69 72 20 | 66 69 6c 65 2d 6e 61 6d |ult-dir |file-nam|
|000062d0| 65 20 63 74 6c 2d 62 75 | 66 20 53 74 61 72 74 42 |e ctl-bu|f StartB|
|000062e0| 75 66 66 65 72 20 28 28 | 73 65 74 2d 62 75 66 66 |uffer ((|set-buff|
|000062f0| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|00006300| 20 64 65 66 61 75 6c 74 | 2d 64 69 72 65 63 74 6f | default|-directo|
|00006310| 72 79 20 65 64 69 66 66 | 2d 6d 61 6b 65 2d 74 65 |ry ediff|-make-te|
|00006320| 6d 70 2d 66 69 6c 65 20 | 73 65 74 2d 76 69 73 69 |mp-file |set-visi|
|00006330| 74 65 64 2d 66 69 6c 65 | 2d 6e 61 6d 65 20 62 75 |ted-file|-name bu|
|00006340| 66 66 65 72 2d 61 75 74 | 6f 2d 73 61 76 65 2d 66 |ffer-aut|o-save-f|
|00006350| 69 6c 65 2d 6e 61 6d 65 | 20 72 65 6e 61 6d 65 2d |ile-name| rename-|
|00006360| 62 75 66 66 65 72 20 73 | 65 74 2d 62 75 66 66 65 |buffer s|et-buffe|
|00006370| 72 2d 6d 6f 64 69 66 69 | 65 64 2d 70 20 73 65 74 |r-modifi|ed-p set|
|00006380| 2d 76 69 73 69 74 65 64 | 2d 66 69 6c 65 2d 6d 6f |-visited|-file-mo|
|00006390| 64 74 69 6d 65 20 74 68 | 69 73 2d 63 6f 6d 6d 61 |dtime th|is-comma|
|000063a0| 6e 64 20 65 64 69 66 66 | 2d 71 75 69 74 20 65 72 |nd ediff|-quit er|
|000063b0| 72 6f 72 20 22 59 6f 75 | 27 76 65 20 6b 69 6c 6c |ror "You|'ve kill|
|000063c0| 65 64 20 61 6e 20 65 73 | 73 65 6e 74 69 61 6c 20 |ed an es|sential |
|000063d0| 45 64 69 66 66 20 62 75 | 66 66 65 72 2d 2d 2d 50 |Ediff bu|ffer---P|
|000063e0| 6c 65 61 73 65 20 71 75 | 69 74 20 45 64 69 66 66 |lease qu|it Ediff|
|000063f0| 22 20 65 64 69 66 66 2d | 70 61 74 63 68 2d 66 69 |" ediff-|patch-fi|
+--------+-------------------------+-------------------------+--------+--------+
Only 25.0 KB of data is shown above.
